summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authordjm <djm>2008-03-07 07:31:47 +0000
committerdjm <djm>2008-03-07 07:31:47 +0000
commit44416f3458c9aad2ed28fd0923a1f9dccb67f04c (patch)
tree736b08a7ab5eaa6b4617ecb8759623f543935b57 /sshd.c
parentd6ff65b4332e3ee0ff49d06221393c315927db04 (diff)
downloadopenssh-44416f3458c9aad2ed28fd0923a1f9dccb67f04c.tar.gz
- 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
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 2920b26c..5ea87f0f 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 <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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);