- djm@cvs.openbsd.org 2013/07/12 00:19:59

     [auth-options.c auth-rsa.c bufaux.c buffer.h channels.c hostfile.c]
     [hostfile.h mux.c packet.c packet.h roaming_common.c serverloop.c]
     fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

1 files changed, 5 insertions, 3 deletions

diff --git a/auth-options.c b/auth-options.c
index a8d738ace..80d59ee95 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.58 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.59 2013/07/12 00:19:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -432,7 +432,8 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
 {
         char *command, *allowed;
         const char *remote_ip;
-        u_char *name = NULL, *data_blob = NULL;
+        char *name = NULL;
+        u_char *data_blob = NULL;
         u_int nlen, dlen, clen;
         Buffer c, data;
         int ret = -1, found;
@@ -550,7 +551,8 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
                 buffer_clear(&data);
                 free(name);
                 free(data_blob);
-                name = data_blob = NULL;
+                name = NULL;
+                data_blob = NULL;
         }
         /* successfully parsed all options */
         ret = 0;