- avsm@cvs.openbsd.org 2004/06/21 17:36:31

     [auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c
     cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c
     monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c
     ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c
     sshpty.c]
     make ssh -Wshadow clean, no functional changes
     markus@ ok

There are also some portable-specific -Wshadow warnings to be fixed in
monitor.c and montior_wrap.c.

1 files changed, 4 insertions, 4 deletions

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 3063eecc3..9898d4a63 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-pubkey.c,v 1.6 2004/01/19 21:25:15 markus Exp $");
+RCSID("$OpenBSD: auth2-pubkey.c,v 1.7 2004/06/21 17:36:31 avsm Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -205,7 +205,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
         found = key_new(key->type);
 
         while (fgets(line, sizeof(line), f)) {
-                char *cp, *options = NULL;
+                char *cp, *key_options = NULL;
                 linenum++;
                 /* Skip leading whitespace, empty and comment lines. */
                 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
@@ -217,7 +217,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
                         /* no key?  check if there are options for this key */
                         int quoted = 0;
                         debug2("user_key_allowed: check options: '%s'", cp);
-                        options = cp;
+                        key_options = cp;
                         for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
                                 if (*cp == '\\' && cp[1] == '"')
                                         cp++;   /* Skip both */
@@ -234,7 +234,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
                         }
                 }
                 if (key_equal(found, key) &&
-                    auth_parse_options(pw, options, file, linenum) == 1) {
+                    auth_parse_options(pw, key_options, file, linenum) == 1) {
                         found_key = 1;
                         debug("matching key found: file %s, line %lu",
                             file, linenum);