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 /ssh-pkcs11-client.c | |
parent | d59ce08811bf94111c2f442184cf7d1257ffae24 (diff) |
upstream commit
Pass (char *)NULL rather than (char *)0 to execl and
execlp.
ok dtucker@
Upstream-ID: 56c955106cbddba86c3dd9bbf786ac0d1b361492
Diffstat (limited to 'ssh-pkcs11-client.c')
-rw-r--r-- | ssh-pkcs11-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c index 8c74864aa..fac0167e6 100644 --- a/ssh-pkcs11-client.c +++ b/ssh-pkcs11-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-pkcs11-client.c,v 1.5 2014/06/24 01:13:21 djm Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11-client.c,v 1.6 2015/12/11 00:20:04 mmcc Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -173,7 +173,7 @@ pkcs11_start_helper(void) | |||
173 | close(pair[0]); | 173 | close(pair[0]); |
174 | close(pair[1]); | 174 | close(pair[1]); |
175 | execlp(_PATH_SSH_PKCS11_HELPER, _PATH_SSH_PKCS11_HELPER, | 175 | execlp(_PATH_SSH_PKCS11_HELPER, _PATH_SSH_PKCS11_HELPER, |
176 | (char *) 0); | 176 | (char *)NULL); |
177 | fprintf(stderr, "exec: %s: %s\n", _PATH_SSH_PKCS11_HELPER, | 177 | fprintf(stderr, "exec: %s: %s\n", _PATH_SSH_PKCS11_HELPER, |
178 | strerror(errno)); | 178 | strerror(errno)); |
179 | _exit(1); | 179 | _exit(1); |