From a25c7666acbcdd8285960b93aa93b2afbec02aa7 Mon Sep 17 00:00:00 2001 From: Marc Balmer Date: Thu, 14 Feb 2008 13:10:32 +0000 Subject: When started in configuration test mode (-t) do not check that sshd is being started with an absolute path. ok djm --- usr.bin/ssh/sshd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin/ssh/sshd.c') diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index afa3ff75793..1a032d8a65a 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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 @@ -1328,7 +1328,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