summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-07 18:31:47 +1100
committerDamien Miller <djm@mindrot.org>2008-03-07 18:31:47 +1100
commit2ee0c43f983f54dd0b224f0616d400789c46abb2 (patch)
tree9fb4ad533fb14a681ee2f07a2920441d8c77bff9
parent76e95daad1f38e0ba8e7bf0554cadd6e3aaf5235 (diff)
- mbalmer@cvs.openbsd.org 2008/02/14 13:10:31
[sshd.c] When started in configuration test mode (-t) do not check that sshd is being started with an absolute path. ok djm
-rw-r--r--ChangeLog7
-rw-r--r--sshd.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 341360d2b..831fd37d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
9 rekey arc4random and OpenSSL RNG in postauth child 9 rekey arc4random and OpenSSL RNG in postauth child
10 closefrom fds > 2 before shell/command execution 10 closefrom fds > 2 before shell/command execution
11 ok markus@ 11 ok markus@
12 - mbalmer@cvs.openbsd.org 2008/02/14 13:10:31
13 [sshd.c]
14 When started in configuration test mode (-t) do not check that sshd is
15 being started with an absolute path.
16 ok djm
12 17
1320080302 1820080302
14 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect 19 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect
@@ -3669,4 +3674,4 @@
3669 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3674 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3670 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3675 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3671 3676
3672$Id: ChangeLog,v 1.4852 2008/03/07 07:31:24 djm Exp $ 3677$Id: ChangeLog,v 1.4853 2008/03/07 07:31:47 djm Exp $
diff --git a/sshd.c b/sshd.c
index 2920b26cf..5ea87f0f9 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.354 2008/02/13 22:38:17 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.355 2008/02/14 13:10:31 mbalmer Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1387,7 +1387,7 @@ main(int ac, char **av)
1387 } 1387 }
1388 if (rexeced_flag || inetd_flag) 1388 if (rexeced_flag || inetd_flag)
1389 rexec_flag = 0; 1389 rexec_flag = 0;
1390 if (rexec_flag && (av[0] == NULL || *av[0] != '/')) 1390 if (!test_flag && (rexec_flag && (av[0] == NULL || *av[0] != '/')))
1391 fatal("sshd re-exec requires execution with an absolute path"); 1391 fatal("sshd re-exec requires execution with an absolute path");
1392 if (rexeced_flag) 1392 if (rexeced_flag)
1393 closefrom(REEXEC_MIN_FREE_FD); 1393 closefrom(REEXEC_MIN_FREE_FD);