diff options
| author | Damien Miller <djm@mindrot.org> | 2013-07-18 16:12:44 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-07-18 16:12:44 +1000 |
| commit | ce98654674648fb7d58f73edf6aa398656a2dba4 (patch) | |
| tree | 0eaf824f5ec795de2204e800d6e1d74d2c905ac8 /auth-options.c | |
| parent | 0d02c3e10e1ed16d6396748375a133d348127a2a (diff) | |
| download | openssh-git-ce98654674648fb7d58f73edf6aa398656a2dba4.tar.gz | |
- 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@
Diffstat (limited to 'auth-options.c')
| -rw-r--r-- | auth-options.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/auth-options.c b/auth-options.c index a8d738ac..80d59ee9 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; |