diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | session.c | 10 | ||||
-rw-r--r-- | ssh_config | 2 | ||||
-rw-r--r-- | sshd.c | 4 |
5 files changed, 22 insertions, 8 deletions
@@ -1,3 +1,13 @@ | |||
1 | 20000712 | ||
2 | - Remove -lresolve for Reliant Unix | ||
3 | - (djm) OpenBSD CVS Updates: | ||
4 | - deraadt@cvs.openbsd.org 2000/07/11 02:11:34 | ||
5 | [session.c sshd.c ] | ||
6 | make MaxStartups code still work with -d; djm | ||
7 | - deraadt@cvs.openbsd.org 2000/07/11 13:17:45 | ||
8 | [readconf.c ssh_config] | ||
9 | disable FallBackToRsh by default | ||
10 | |||
1 | 20000711 | 11 | 20000711 |
2 | - (djm) Fixup for AIX getuserattr() support from Tom Bertelson | 12 | - (djm) Fixup for AIX getuserattr() support from Tom Bertelson |
3 | <tbert@abac.com> | 13 | <tbert@abac.com> |
diff --git a/readconf.c b/readconf.c index 28aa0a8b8..c514e9b59 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: readconf.c,v 1.40 2000/07/10 16:27:05 ho Exp $"); | 17 | RCSID("$OpenBSD: readconf.c,v 1.41 2000/07/11 19:17:44 deraadt Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "cipher.h" | 20 | #include "cipher.h" |
@@ -739,7 +739,7 @@ fill_default_options(Options * options) | |||
739 | if (options->rhosts_rsa_authentication == -1) | 739 | if (options->rhosts_rsa_authentication == -1) |
740 | options->rhosts_rsa_authentication = 1; | 740 | options->rhosts_rsa_authentication = 1; |
741 | if (options->fallback_to_rsh == -1) | 741 | if (options->fallback_to_rsh == -1) |
742 | options->fallback_to_rsh = 1; | 742 | options->fallback_to_rsh = 0; |
743 | if (options->use_rsh == -1) | 743 | if (options->use_rsh == -1) |
744 | options->use_rsh = 0; | 744 | options->use_rsh = 0; |
745 | if (options->batch_mode == -1) | 745 | if (options->batch_mode == -1) |
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: session.c,v 1.22 2000/07/05 20:18:07 deraadt Exp $"); | 11 | RCSID("$OpenBSD: session.c,v 1.23 2000/07/11 08:11:33 deraadt Exp $"); |
12 | 12 | ||
13 | #include "xmalloc.h" | 13 | #include "xmalloc.h" |
14 | #include "ssh.h" | 14 | #include "ssh.h" |
@@ -169,8 +169,10 @@ do_authenticated(struct passwd * pw) | |||
169 | * authentication. | 169 | * authentication. |
170 | */ | 170 | */ |
171 | alarm(0); | 171 | alarm(0); |
172 | if (startup_pipe != -1) | 172 | if (startup_pipe != -1) { |
173 | close(startup_pipe); | 173 | close(startup_pipe); |
174 | startup_pipe = -1; | ||
175 | } | ||
174 | 176 | ||
175 | /* | 177 | /* |
176 | * Inform the channel mechanism that we are the server side and that | 178 | * Inform the channel mechanism that we are the server side and that |
@@ -1793,8 +1795,10 @@ do_authenticated2(void) | |||
1793 | * authentication. | 1795 | * authentication. |
1794 | */ | 1796 | */ |
1795 | alarm(0); | 1797 | alarm(0); |
1796 | if (startup_pipe != -1) | 1798 | if (startup_pipe != -1) { |
1797 | close(startup_pipe); | 1799 | close(startup_pipe); |
1800 | startup_pipe = -1; | ||
1801 | } | ||
1798 | server_loop2(); | 1802 | server_loop2(); |
1799 | if (xauthfile) | 1803 | if (xauthfile) |
1800 | xauthfile_cleanup_proc(NULL); | 1804 | xauthfile_cleanup_proc(NULL); |
diff --git a/ssh_config b/ssh_config index 5963b16df..70275b392 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -19,7 +19,7 @@ | |||
19 | # RhostsRSAAuthentication yes | 19 | # RhostsRSAAuthentication yes |
20 | # RSAAuthentication yes | 20 | # RSAAuthentication yes |
21 | # PasswordAuthentication yes | 21 | # PasswordAuthentication yes |
22 | # FallBackToRsh yes | 22 | # FallBackToRsh no |
23 | # UseRsh no | 23 | # UseRsh no |
24 | # BatchMode no | 24 | # BatchMode no |
25 | # CheckHostIP yes | 25 | # CheckHostIP yes |
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: sshd.c,v 1.121 2000/07/05 21:35:56 provos Exp $"); | 17 | RCSID("$OpenBSD: sshd.c,v 1.122 2000/07/11 08:11:34 deraadt Exp $"); |
18 | 18 | ||
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | #include "rsa.h" | 20 | #include "rsa.h" |
@@ -854,8 +854,8 @@ main(int ac, char **av) | |||
854 | close_listen_socks(); | 854 | close_listen_socks(); |
855 | sock_in = newsock; | 855 | sock_in = newsock; |
856 | sock_out = newsock; | 856 | sock_out = newsock; |
857 | pid = getpid(); | ||
858 | startup_pipe = -1; | 857 | startup_pipe = -1; |
858 | pid = getpid(); | ||
859 | break; | 859 | break; |
860 | } else { | 860 | } else { |
861 | /* | 861 | /* |