From 2ee0c43f983f54dd0b224f0616d400789c46abb2 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 7 Mar 2008 18:31:47 +1100 Subject: - 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 --- ChangeLog | 7 ++++++- sshd.c | 4 ++-- 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 @@ rekey arc4random and OpenSSL RNG in postauth child closefrom fds > 2 before shell/command execution ok markus@ + - 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 20080302 - (dtucker) [configure.ac] FreeBSD's glob() doesn't behave the way we expect @@ -3669,4 +3674,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4852 2008/03/07 07:31:24 djm Exp $ +$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 @@ -/* $OpenBSD: sshd.c,v 1.354 2008/02/13 22:38:17 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.355 2008/02/14 13:10:31 mbalmer Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1387,7 +1387,7 @@ main(int ac, char **av) } if (rexeced_flag || inetd_flag) rexec_flag = 0; - if (rexec_flag && (av[0] == NULL || *av[0] != '/')) + if (!test_flag && (rexec_flag && (av[0] == NULL || *av[0] != '/'))) fatal("sshd re-exec requires execution with an absolute path"); if (rexeced_flag) closefrom(REEXEC_MIN_FREE_FD); -- cgit v1.2.3