summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-12-11 00:20:04 +0000
committerDamien Miller <djm@mindrot.org>2015-12-11 13:23:14 +1100
commit94141b7ade24afceeb6762a3f99e09e47a6c42b6 (patch)
tree720e72d7eecee12f095144e7d469f3d20c2051c5 /sshconnect2.c
parentd59ce08811bf94111c2f442184cf7d1257ffae24 (diff)
upstream commit
Pass (char *)NULL rather than (char *)0 to execl and execlp. ok dtucker@ Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 3c5afe507..98b67e73e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.232 2015/12/10 17:08:40 mmcc Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.233 2015/12/11 00:20:04 mmcc Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1622,7 +1622,7 @@ ssh_keysign(struct sshkey *key, u_char **sigp, size_t *lenp,
1622 closefrom(sock + 1); 1622 closefrom(sock + 1);
1623 debug3("%s: [child] pid=%ld, exec %s", 1623 debug3("%s: [child] pid=%ld, exec %s",
1624 __func__, (long)getpid(), _PATH_SSH_KEY_SIGN); 1624 __func__, (long)getpid(), _PATH_SSH_KEY_SIGN);
1625 execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0); 1625 execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL);
1626 fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN, 1626 fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN,
1627 strerror(errno)); 1627 strerror(errno));
1628 } 1628 }