summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-15 21:29:10 +1000
committerDamien Miller <djm@mindrot.org>2003-05-15 21:29:10 +1000
commit04cb5360545617905ba9099027dd381fc9729344 (patch)
treed70588fef524b16e30bc204620bd698aef583a87
parentb10f1cd8787c4efa3a97fb6354e2e4fb2958f849 (diff)
- (djm) Bug #529: sshd doesn't work correctly after SIGHUP (copy argv
correctly)
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bf783a367..d2c60e8fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,9 @@
49 - (djm) Avoid uuencode.c warnings 49 - (djm) Avoid uuencode.c warnings
50 - (djm) Enable UsePAM when built --with-pam 50 - (djm) Enable UsePAM when built --with-pam
51 - (djm) Only build getrrsetbyname replacement when using --with-dns 51 - (djm) Only build getrrsetbyname replacement when using --with-dns
52 - (djm) Bug #529: sshd doesn't work correctly after SIGHUP (copy argv
53 correctly)
54
5220030514 5520030514
53 - (djm) Bug #117: Don't lie to PAM about username 56 - (djm) Bug #117: Don't lie to PAM about username
54 - (djm) RCSID sync w/ OpenBSD 57 - (djm) RCSID sync w/ OpenBSD
@@ -1523,4 +1526,4 @@
1523 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1526 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1524 ok provos@ 1527 ok provos@
1525 1528
1526$Id: ChangeLog,v 1.2720 2003/05/15 10:55:27 djm Exp $ 1529$Id: ChangeLog,v 1.2721 2003/05/15 11:29:10 djm Exp $
diff --git a/sshd.c b/sshd.c
index cb70fa0c6..c0221bea7 100644
--- a/sshd.c
+++ b/sshd.c
@@ -830,9 +830,10 @@ main(int ac, char **av)
830 /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ 830 /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
831 saved_argc = ac; 831 saved_argc = ac;
832 saved_argv = av; 832 saved_argv = av;
833 saved_argv = xmalloc(sizeof(*saved_argv) * ac); 833 saved_argv = xmalloc(sizeof(*saved_argv) * (ac + 1));
834 for (i = 0; i < ac; i++) 834 for (i = 0; i < ac; i++)
835 saved_argv[i] = xstrdup(av[i]); 835 saved_argv[i] = xstrdup(av[i]);
836 saved_argv[i] = NULL;
836 837
837#ifndef HAVE_SETPROCTITLE 838#ifndef HAVE_SETPROCTITLE
838 /* Prepare for later setproctitle emulation */ 839 /* Prepare for later setproctitle emulation */