summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keysign.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2015-03-24 20:09:11 +0000
committermarkus <markus@openbsd.org>2015-03-24 20:09:11 +0000
commit5381911f538d30a3c98cfc9a23664950a9f1f7f5 (patch)
treec899f32fc156ba8d7ecfff03f96b3761af0c849a /usr.bin/ssh/ssh-keysign.c
parentcorrect fmt-string for size_t as noted by Nicholas Lemonias; ok djm@ (diff)
downloadwireguard-openbsd-5381911f538d30a3c98cfc9a23664950a9f1f7f5.tar.xz
wireguard-openbsd-5381911f538d30a3c98cfc9a23664950a9f1f7f5.zip
consistent check for NULL as noted by Nicholas Lemonias; ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh-keysign.c')
-rw-r--r--usr.bin/ssh/ssh-keysign.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keysign.c b/usr.bin/ssh/ssh-keysign.c
index 0196b60ffba..cd92a563760 100644
--- a/usr.bin/ssh/ssh-keysign.c
+++ b/usr.bin/ssh/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.47 2015/01/28 22:36:00 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.48 2015/03/24 20:09:11 markus Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -147,7 +147,7 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret,
if (fail && key != NULL)
sshkey_free(key);
- else
+ else if (ret != NULL)
*ret = key;
return (fail ? -1 : 0);