diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-15 10:24:13 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-15 10:24:13 +1000 |
commit | 350327c0428572f16b1c4080ef61473942217a27 (patch) | |
tree | d4c9a623c6e14f2705f785ecddf66798ca15b1f6 | |
parent | 94befab9dd03fdcde634a8142ad1004930031a11 (diff) |
- djm@cvs.openbsd.org 2004/05/26 08:59:57
[sftp.c]
exit -> _exit in forked child on error; from andrushock AT korovino.net
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sftp.c | 6 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +20040615 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2004/05/26 08:59:57 + [sftp.c] + exit -> _exit in forked child on error; from andrushock AT korovino.net + 20040603 - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. ok djm@ @@ -1181,4 +1187,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3374 2004/06/03 04:53:12 dtucker Exp $ +$Id: ChangeLog,v 1.3375 2004/06/15 00:24:13 djm Exp $ @@ -16,7 +16,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.46 2004/05/19 12:17:33 djm Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.47 2004/05/26 08:59:57 djm Exp $"); #include "buffer.h" #include "xmalloc.h" @@ -1265,7 +1265,7 @@ connect_to_server(char *path, char **args, int *in, int *out) if ((dup2(c_in, STDIN_FILENO) == -1) || (dup2(c_out, STDOUT_FILENO) == -1)) { fprintf(stderr, "dup2: %s\n", strerror(errno)); - exit(1); + _exit(1); } close(*in); close(*out); @@ -1281,7 +1281,7 @@ connect_to_server(char *path, char **args, int *in, int *out) signal(SIGINT, SIG_IGN); execv(path, args); fprintf(stderr, "exec: %s: %s\n", path, strerror(errno)); - exit(1); + _exit(1); } signal(SIGTERM, killchild); |