diff options
| author | mmcc@openbsd.org <mmcc@openbsd.org> | 2015-12-11 00:20:04 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-12-11 13:23:14 +1100 |
| commit | 94141b7ade24afceeb6762a3f99e09e47a6c42b6 (patch) | |
| tree | 720e72d7eecee12f095144e7d469f3d20c2051c5 | |
| parent | d59ce08811bf94111c2f442184cf7d1257ffae24 (diff) | |
| download | openssh-git-94141b7ade24afceeb6762a3f99e09e47a6c42b6.tar.gz | |
upstream commit
Pass (char *)NULL rather than (char *)0 to execl and
execlp.
ok dtucker@
Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492
| -rw-r--r-- | readpass.c | 4 | ||||
| -rw-r--r-- | ssh-pkcs11-client.c | 4 | ||||
| -rw-r--r-- | sshconnect2.c | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: readpass.c,v 1.50 2014/02/02 03:44:31 djm Exp $ */ +/* $OpenBSD: readpass.c,v 1.51 2015/12/11 00:20:04 mmcc Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -76,7 +76,7 @@ ssh_askpass(char *askpass, const char *msg) close(p[0]); if (dup2(p[1], STDOUT_FILENO) < 0) fatal("ssh_askpass: dup2: %s", strerror(errno)); - execlp(askpass, askpass, msg, (char *) 0); + execlp(askpass, askpass, msg, (char *)NULL); fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno)); } close(p[1]); diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c index 8c74864a..fac0167e 100644 --- a/ssh-pkcs11-client.c +++ b/ssh-pkcs11-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-client.c,v 1.5 2014/06/24 01:13:21 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11-client.c,v 1.6 2015/12/11 00:20:04 mmcc Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -173,7 +173,7 @@ pkcs11_start_helper(void) close(pair[0]); close(pair[1]); execlp(_PATH_SSH_PKCS11_HELPER, _PATH_SSH_PKCS11_HELPER, - (char *) 0); + (char *)NULL); fprintf(stderr, "exec: %s: %s\n", _PATH_SSH_PKCS11_HELPER, strerror(errno)); _exit(1); diff --git a/sshconnect2.c b/sshconnect2.c index 3c5afe50..98b67e73 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.232 2015/12/10 17:08:40 mmcc Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.233 2015/12/11 00:20:04 mmcc Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1622,7 +1622,7 @@ ssh_keysign(struct sshkey *key, u_char **sigp, size_t *lenp, closefrom(sock + 1); debug3("%s: [child] pid=%ld, exec %s", __func__, (long)getpid(), _PATH_SSH_KEY_SIGN); - execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0); + execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *)NULL); fatal("%s: exec(%s): %s", __func__, _PATH_SSH_KEY_SIGN, strerror(errno)); } |