diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-options.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -43,6 +43,9 @@ | |||
43 | - markus@cvs.openbsd.org 2001/02/10 12:09:21 | 43 | - markus@cvs.openbsd.org 2001/02/10 12:09:21 |
44 | [sshconnect2.c] | 44 | [sshconnect2.c] |
45 | remove some lines | 45 | remove some lines |
46 | - markus@cvs.openbsd.org 2001/02/09 13:38:07 | ||
47 | [auth-options.c] | ||
48 | reset options if no option is given; from han.holl@prismant.nl | ||
46 | instead of '0' (from the OpenBSD tree) | 49 | instead of '0' (from the OpenBSD tree) |
47 | - (bal) Synced ssh.1 and sshd.8 w/ OpenBSD | 50 | - (bal) Synced ssh.1 and sshd.8 w/ OpenBSD |
48 | 51 | ||
@@ -3828,4 +3831,4 @@ | |||
3828 | - Wrote replacements for strlcpy and mkdtemp | 3831 | - Wrote replacements for strlcpy and mkdtemp |
3829 | - Released 1.0pre1 | 3832 | - Released 1.0pre1 |
3830 | 3833 | ||
3831 | $Id: ChangeLog,v 1.724 2001/02/10 22:19:23 mouring Exp $ | 3834 | $Id: ChangeLog,v 1.725 2001/02/10 22:27:19 mouring Exp $ |
diff --git a/auth-options.c b/auth-options.c index 04d2f085f..57e335f3f 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth-options.c,v 1.12 2001/02/03 10:08:36 markus Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.13 2001/02/09 13:38:07 markus Exp $"); |
14 | 14 | ||
15 | #include "packet.h" | 15 | #include "packet.h" |
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
@@ -61,12 +61,13 @@ int | |||
61 | auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | 61 | auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) |
62 | { | 62 | { |
63 | const char *cp; | 63 | const char *cp; |
64 | if (!opts) | ||
65 | return 1; | ||
66 | 64 | ||
67 | /* reset options */ | 65 | /* reset options */ |
68 | auth_clear_options(); | 66 | auth_clear_options(); |
69 | 67 | ||
68 | if (!opts) | ||
69 | return 1; | ||
70 | |||
70 | while (*opts && *opts != ' ' && *opts != '\t') { | 71 | while (*opts && *opts != ' ' && *opts != '\t') { |
71 | cp = "no-port-forwarding"; | 72 | cp = "no-port-forwarding"; |
72 | if (strncasecmp(opts, cp, strlen(cp)) == 0) { | 73 | if (strncasecmp(opts, cp, strlen(cp)) == 0) { |