summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a32ea4b6b..c58f63cd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120040615
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2004/05/26 08:59:57
4 [sftp.c]
5 exit -> _exit in forked child on error; from andrushock AT korovino.net
6
120040603 720040603
2 - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. 8 - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
3 ok djm@ 9 ok djm@
@@ -1181,4 +1187,4 @@
1181 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1187 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1182 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1188 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1183 1189
1184$Id: ChangeLog,v 1.3374 2004/06/03 04:53:12 dtucker Exp $ 1190$Id: ChangeLog,v 1.3375 2004/06/15 00:24:13 djm Exp $
diff --git a/sftp.c b/sftp.c
index 0bc68f058..eef9f1185 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
16 16
17#include "includes.h" 17#include "includes.h"
18 18
19RCSID("$OpenBSD: sftp.c,v 1.46 2004/05/19 12:17:33 djm Exp $"); 19RCSID("$OpenBSD: sftp.c,v 1.47 2004/05/26 08:59:57 djm Exp $");
20 20
21#include "buffer.h" 21#include "buffer.h"
22#include "xmalloc.h" 22#include "xmalloc.h"
@@ -1265,7 +1265,7 @@ connect_to_server(char *path, char **args, int *in, int *out)
1265 if ((dup2(c_in, STDIN_FILENO) == -1) || 1265 if ((dup2(c_in, STDIN_FILENO) == -1) ||
1266 (dup2(c_out, STDOUT_FILENO) == -1)) { 1266 (dup2(c_out, STDOUT_FILENO) == -1)) {
1267 fprintf(stderr, "dup2: %s\n", strerror(errno)); 1267 fprintf(stderr, "dup2: %s\n", strerror(errno));
1268 exit(1); 1268 _exit(1);
1269 } 1269 }
1270 close(*in); 1270 close(*in);
1271 close(*out); 1271 close(*out);
@@ -1281,7 +1281,7 @@ connect_to_server(char *path, char **args, int *in, int *out)
1281 signal(SIGINT, SIG_IGN); 1281 signal(SIGINT, SIG_IGN);
1282 execv(path, args); 1282 execv(path, args);
1283 fprintf(stderr, "exec: %s: %s\n", path, strerror(errno)); 1283 fprintf(stderr, "exec: %s: %s\n", path, strerror(errno));
1284 exit(1); 1284 _exit(1);
1285 } 1285 }
1286 1286
1287 signal(SIGTERM, killchild); 1287 signal(SIGTERM, killchild);