diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-03-24 20:09:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-03-27 12:00:52 +1100 |
| commit | 7d4f96f9de2a18af0d9fa75ea89a4990de0344f5 (patch) | |
| tree | 783c123d1bccf5308397bafc34fa9770b0b061b7 /ssh-keysign.c | |
| parent | df100be51354e447d9345cf1ec22e6013c0eed50 (diff) | |
| download | openssh-git-7d4f96f9de2a18af0d9fa75ea89a4990de0344f5.tar.gz | |
upstream commit
consistent check for NULL as noted by Nicholas
Lemonias; ok djm@
Diffstat (limited to 'ssh-keysign.c')
| -rw-r--r-- | ssh-keysign.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index bcf897a0..56882027 100644 --- a/ssh-keysign.c +++ b/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. * @@ -157,7 +157,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); |