- (djm) Big OpenBSD sync:

   - markus@cvs.openbsd.org  2000/09/30 10:27:44
     [log.c]
     allow loglevel debug
   - markus@cvs.openbsd.org  2000/10/03 11:59:57
     [packet.c]
     hmac->mac
   - markus@cvs.openbsd.org  2000/10/03 12:03:03
     [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
     move fake-auth from auth1.c to individual auth methods, disables s/key in
     debug-msg
   - markus@cvs.openbsd.org  2000/10/03 12:16:48
     ssh.c
     do not resolve canonname, i have no idea why this was added oin ossh
   - markus@cvs.openbsd.org  2000/10/09 15:30:44
     ssh-keygen.1 ssh-keygen.c
     -X now reads private ssh.com DSA keys, too.
   - markus@cvs.openbsd.org  2000/10/09 15:32:34
     auth-options.c
     clear options on every call.
   - markus@cvs.openbsd.org  2000/10/09 15:51:00
     authfd.c authfd.h
     interop with ssh-agent2, from <res@shore.net>
   - markus@cvs.openbsd.org  2000/10/10 14:20:45
     compat.c
     use rexexp for version string matching
   - provos@cvs.openbsd.org  2000/10/10 22:02:18
     [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
     First rough implementation of the diffie-hellman group exchange.  The
     client can ask the server for bigger groups to perform the diffie-hellman
     in, thus increasing the attack complexity when using ciphers with longer
     keys.  University of Windsor provided network, T the company.
   - markus@cvs.openbsd.org  2000/10/11 13:59:52
     [auth-rsa.c auth2.c]
     clear auth options unless auth sucessfull
   - markus@cvs.openbsd.org  2000/10/11 14:00:27
     [auth-options.h]
     clear auth options unless auth sucessfull
   - markus@cvs.openbsd.org  2000/10/11 14:03:27
     [scp.1 scp.c]
     support 'scp -o' with help from mouring@pconline.com
   - markus@cvs.openbsd.org  2000/10/11 14:11:35
     [dh.c]
     Wall
   - markus@cvs.openbsd.org  2000/10/11 14:14:40
     [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
     [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
     add support for s/key (kbd-interactive) to ssh2, based on work by
     mkiernan@avantgo.com and me
   - markus@cvs.openbsd.org  2000/10/11 14:27:24
     [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
     [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
     [sshconnect2.c sshd.c]
     new cipher framework
   - markus@cvs.openbsd.org  2000/10/11 14:45:21
     [cipher.c]
     remove DES
   - markus@cvs.openbsd.org  2000/10/12 03:59:20
     [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
     enable DES in SSH-1 clients only
   - markus@cvs.openbsd.org  2000/10/12 08:21:13
     [kex.h packet.c]
     remove unused
   - markus@cvs.openbsd.org  2000/10/13 12:34:46
     [sshd.c]
     Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
   - markus@cvs.openbsd.org  2000/10/13 12:59:15
     [cipher.c cipher.h myproposal.h  rijndael.c rijndael.h]
     rijndael/aes support
   - markus@cvs.openbsd.org  2000/10/13 13:10:54
     [sshd.8]
     more info about -V
   - markus@cvs.openbsd.org  2000/10/13 13:12:02
     [myproposal.h]
     prefer no compression

1 files changed, 28 insertions, 20 deletions

diff --git a/auth-options.c b/auth-options.c
index da6965266..c9c149d69 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.4 2000/09/07 21:13:36 markus Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.5 2000/10/09 21:32:34 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -33,6 +33,25 @@ char *forced_command = NULL;
 /* "environment=" options. */
 struct envstring *custom_environment = NULL;
 
+void
+auth_clear_options(void)
+{
+        no_agent_forwarding_flag = 0;
+        no_port_forwarding_flag = 0;
+        no_pty_flag = 0;
+        no_x11_forwarding_flag = 0;
+        while (custom_environment) {
+                struct envstring *ce = custom_environment;
+                custom_environment = ce->next;
+                xfree(ce->s);
+                xfree(ce);
+        }
+        if (forced_command) {
+                xfree(forced_command);
+                forced_command = NULL;
+        }
+}
+
 /* return 1 if access is granted, 0 if not. side effect: sets key option flags */
 int
 auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
@@ -40,6 +59,10 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
         const char *cp;
         if (!options)
                 return 1;
+
+        /* reset options */
+        auth_clear_options();
+
         while (*options && *options != ' ' && *options != '\t') {
                 cp = "no-port-forwarding";
                 if (strncmp(options, cp, strlen(cp)) == 0) {
@@ -87,9 +110,9 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
                         }
                         if (!*options) {
                                 debug("%.100s, line %lu: missing end quote",
-                                      SSH_USER_PERMITTED_KEYS, linenum);
+                                    SSH_USER_PERMITTED_KEYS, linenum);
                                 packet_send_debug("%.100s, line %lu: missing end quote",
-                                                  SSH_USER_PERMITTED_KEYS, linenum);
+                                    SSH_USER_PERMITTED_KEYS, linenum);
                                 continue;
                         }
                         forced_command[i] = 0;
@@ -117,9 +140,9 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
                         }
                         if (!*options) {
                                 debug("%.100s, line %lu: missing end quote",
-                                      SSH_USER_PERMITTED_KEYS, linenum);
+                                    SSH_USER_PERMITTED_KEYS, linenum);
                                 packet_send_debug("%.100s, line %lu: missing end quote",
-                                                  SSH_USER_PERMITTED_KEYS, linenum);
+                                    SSH_USER_PERMITTED_KEYS, linenum);
                                 continue;
                         }
                         s[i] = 0;
@@ -175,21 +198,6 @@ auth_parse_options(struct passwd *pw, char *options, unsigned long linenum)
                                     get_remote_ipaddr());
                                 packet_send_debug("Your host '%.200s' is not permitted to use this key for login.",
                                 get_canonical_hostname());
-                                /* key invalid for this host, reset flags */
-                                no_agent_forwarding_flag = 0;
-                                no_port_forwarding_flag = 0;
-                                no_pty_flag = 0;
-                                no_x11_forwarding_flag = 0;
-                                while (custom_environment) {
-                                        struct envstring *ce = custom_environment;
-                                        custom_environment = ce->next;
-                                        xfree(ce->s);
-                                        xfree(ce);
-                                }
-                                if (forced_command) {
-                                        xfree(forced_command);
-                                        forced_command = NULL;
-                                }
                                 /* deny access */
                                 return 0;
                         }