- markus@cvs.openbsd.org 2001/02/09 13:38:07

     [auth-options.c]
     reset options if no option is given; from han.holl@prismant.nl

diff --git a/ChangeLog b/ChangeLog
index f6d6e0f2ac7ba7c26a798e2d2462b16f20352837..c70d2a2540c48a7b03b48b6e6e796b5cee7b676b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
    - markus@cvs.openbsd.org 2001/02/10 12:09:21
      [sshconnect2.c]
      remove some lines
+   - markus@cvs.openbsd.org 2001/02/09 13:38:07
+     [auth-options.c]
+     reset options if no option is given; from han.holl@prismant.nl
    instead of '0'  (from the OpenBSD tree)
  - (bal) Synced ssh.1 and sshd.8 w/ OpenBSD
 

diff --git a/auth-options.c b/auth-options.c
index 04d2f085f62c58e6ad375bdac488db5e0fa7f43b..57e335f3f19ca4fc495a20c95d1c1a071caddc1f 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.12 2001/02/03 10:08:36 markus Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.13 2001/02/09 13:38:07 markus Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -61,12 +61,13 @@ int
 auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
 {
        const char *cp;
-       if (!opts)
-               return 1;
 
        /* reset options */
        auth_clear_options();
 
+       if (!opts)
+               return 1;
+
        while (*opts && *opts != ' ' && *opts != '\t') {
                cp = "no-port-forwarding";
                if (strncasecmp(opts, cp, strlen(cp)) == 0) {