- djm@cvs.openbsd.org 2004/05/26 08:59:57
[sftp.c] exit -> _exit in forked child on error; from andrushock AT korovino.net
This commit is contained in:
parent
94befab9dd
commit
350327c042
|
@ -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
|
20040603
|
||||||
- (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
|
- (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
|
||||||
ok djm@
|
ok djm@
|
||||||
|
@ -1181,4 +1187,4 @@
|
||||||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (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 $
|
||||||
|
|
6
sftp.c
6
sftp.c
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "buffer.h"
|
||||||
#include "xmalloc.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) ||
|
if ((dup2(c_in, STDIN_FILENO) == -1) ||
|
||||||
(dup2(c_out, STDOUT_FILENO) == -1)) {
|
(dup2(c_out, STDOUT_FILENO) == -1)) {
|
||||||
fprintf(stderr, "dup2: %s\n", strerror(errno));
|
fprintf(stderr, "dup2: %s\n", strerror(errno));
|
||||||
exit(1);
|
_exit(1);
|
||||||
}
|
}
|
||||||
close(*in);
|
close(*in);
|
||||||
close(*out);
|
close(*out);
|
||||||
|
@ -1281,7 +1281,7 @@ connect_to_server(char *path, char **args, int *in, int *out)
|
||||||
signal(SIGINT, SIG_IGN);
|
signal(SIGINT, SIG_IGN);
|
||||||
execv(path, args);
|
execv(path, args);
|
||||||
fprintf(stderr, "exec: %s: %s\n", path, strerror(errno));
|
fprintf(stderr, "exec: %s: %s\n", path, strerror(errno));
|
||||||
exit(1);
|
_exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
signal(SIGTERM, killchild);
|
signal(SIGTERM, killchild);
|
||||||
|
|
Loading…
Reference in New Issue