summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect2.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e1c95a58..f43d19219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
28 [sshconnect2.c] 28 [sshconnect2.c]
29 stat ssh-keysign first, print error if stat fails; 29 stat ssh-keysign first, print error if stat fails;
30 some debug->error; fix comment 30 some debug->error; fix comment
31 - markus@cvs.openbsd.org 2002/05/25 08:50:39
32 [sshconnect2.c]
33 execlp->execl; from stevesk
31 34
3220020604 3520020604
33 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 36 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -712,4 +715,4 @@
712 - (stevesk) entropy.c: typo in debug message 715 - (stevesk) entropy.c: typo in debug message
713 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 716 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
714 717
715$Id: ChangeLog,v 1.2151 2002/06/06 19:59:29 mouring Exp $ 718$Id: ChangeLog,v 1.2152 2002/06/06 20:05:57 mouring Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 258d7cf56..3a0eb761a 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.101 2002/05/24 08:45:14 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.102 2002/05/25 08:50:39 markus Exp $");
27 27
28#include "ssh.h" 28#include "ssh.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -933,7 +933,7 @@ ssh_keysign(
933 close(to[1]); 933 close(to[1]);
934 if (dup2(to[0], STDIN_FILENO) < 0) 934 if (dup2(to[0], STDIN_FILENO) < 0)
935 fatal("ssh_keysign: dup2: %s", strerror(errno)); 935 fatal("ssh_keysign: dup2: %s", strerror(errno));
936 execlp(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0); 936 execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0);
937 fatal("ssh_keysign: exec(%s): %s", _PATH_SSH_KEY_SIGN, 937 fatal("ssh_keysign: exec(%s): %s", _PATH_SSH_KEY_SIGN,
938 strerror(errno)); 938 strerror(errno));
939 } 939 }