- djm@cvs.openbsd.org 2004/05/26 08:59:57

     [sftp.c]
     exit -> _exit in forked child on error; from andrushock AT korovino.net

diff --git a/ChangeLog b/ChangeLog
index 92529c6633e8d659c7c186ac0a45219a87b839ba..d155fcdaa55bae257e9cbc589021afbdb0dc2eec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@

diff --git a/sftp.c b/sftp.c
index 0bc68f05875b0a8ed964009cfb0c36602d2dd5f7..eef9f11859c272912eb709bb986271fab7c351ca 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -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);