summaryrefslogtreecommitdiffstats
path: root/ssh-pkcs11-client.c
diff options
context:
space:
mode:
authormmcc@openbsd.org <mmcc@openbsd.org>2015-12-11 01:20:04 +0100
committerDamien Miller <djm@mindrot.org>2015-12-11 03:23:14 +0100
commit94141b7ade24afceeb6762a3f99e09e47a6c42b6 (patch)
tree720e72d7eecee12f095144e7d469f3d20c2051c5 /ssh-pkcs11-client.c
parentupstream commit (diff)
downloadopenssh-94141b7ade24afceeb6762a3f99e09e47a6c42b6.tar.xz
openssh-94141b7ade24afceeb6762a3f99e09e47a6c42b6.zip
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.c4
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 @@
-/* $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);