- 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, 5 insertions, 5 deletions

diff --git a/ssh.c b/ssh.c
index b9bd8c0d1..9e3f73555 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.220 2004/06/20 17:36:59 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.221 2004/06/21 17:36:31 avsm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -807,17 +807,17 @@ x11_get_proto(char **_proto, char **_data)
          * for the local connection.
          */
         if (!got_data) {
-                u_int32_t rand = 0;
+                u_int32_t rnd = 0;
 
                 logit("Warning: No xauth data; "
                     "using fake authentication data for X11 forwarding.");
                 strlcpy(proto, SSH_X11_PROTO, sizeof proto);
                 for (i = 0; i < 16; i++) {
                         if (i % 4 == 0)
-                                rand = arc4random();
+                                rnd = arc4random();
                         snprintf(data + 2 * i, sizeof data - 2 * i, "%02x",
-                            rand & 0xff);
-                        rand >>= 8;
+                            rnd & 0xff);
+                        rnd >>= 8;
                 }
         }
 }