2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 934d27eb1..be7548848 100644
--- 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
 
@@ -3828,4 +3831,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.724 2001/02/10 22:19:23 mouring Exp $
+$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 @@
  */
 
 #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) {