summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keysign.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2018-02-07 22:52:45 +0000
committerdtucker <dtucker@openbsd.org>2018-02-07 22:52:45 +0000
commitb745bc7cbce9ee4db588d8b5f3ac7e04101590e3 (patch)
tree777eee293024ab5804dbf282f3406bf56e2e1817 /usr.bin/ssh/ssh-keysign.c
parentcomment change only. ok bluhm@ (diff)
downloadwireguard-openbsd-b745bc7cbce9ee4db588d8b5f3ac7e04101590e3.tar.xz
wireguard-openbsd-b745bc7cbce9ee4db588d8b5f3ac7e04101590e3.zip
ssh_free checks for and handles NULL args, remove NULL checks from remaining
callers. 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 c40bad96b3f..dc2c5eec457 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.52 2016/02/15 09:47:49 dtucker Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.53 2018/02/07 22:52:45 dtucker Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -148,7 +148,7 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret,
debug3("%s: fail %d", __func__, fail);
- if (fail && key != NULL)
+ if (fail)
sshkey_free(key);
else if (ret != NULL)
*ret = key;