summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-25 14:22:23 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-25 14:22:23 +1000
commit17c5d03ad3bcb782b5b3768b3e70a050d86d5fa1 (patch)
tree50372f829f40f144a5af69dc9a0b3ed5fee37e0d
parent60bd4098f64fd0fbbd9b6b4de2562623318141a0 (diff)
- (dtucker) [sshd.c] add line missing from reexec sync.
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87659375b..94172428a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
16 clean reexec-specific junk out of text-exec.sh and simplify; idea markus@ 16 clean reexec-specific junk out of text-exec.sh and simplify; idea markus@
17 - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h] 17 - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h]
18 Add closefrom() for platforms that don't have it. 18 Add closefrom() for platforms that don't have it.
19 - (dtucker) [sshd.c] add line missing from reexec sync.
19 20
2020040623 2120040623
21 - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 22 - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
@@ -1418,4 +1419,4 @@
1418 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1419 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1419 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1420 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1420 1421
1421$Id: ChangeLog,v 1.3448 2004/06/25 04:03:34 dtucker Exp $ 1422$Id: ChangeLog,v 1.3449 2004/06/25 04:22:23 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 2408fcb5a..015eeac9a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -895,6 +895,7 @@ main(int ac, char **av)
895 895
896 /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ 896 /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
897 saved_argc = ac; 897 saved_argc = ac;
898 rexec_argc = ac;
898 saved_argv = xmalloc(sizeof(*saved_argv) * (ac + 1)); 899 saved_argv = xmalloc(sizeof(*saved_argv) * (ac + 1));
899 for (i = 0; i < ac; i++) 900 for (i = 0; i < ac; i++)
900 saved_argv[i] = xstrdup(av[i]); 901 saved_argv[i] = xstrdup(av[i]);