From eed253e77363388ae5f6e3ad62318560c8d398df Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 12 Sep 2024 00:36:27 +0000 Subject: [PATCH] Relax absolute path requirement back to what it was prior to OpenSSH 9.8, which incorrectly required that sshd was started with an absolute path in inetd mode. bz3717, patch from Colin Wilson --- usr.bin/ssh/sshd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index e2037b2bae9..74b0fa16b71 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.610 2024/08/17 08:09:50 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.611 2024/09/12 00:36:27 djm Exp $ */ /* * Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 2002 Niels Provos. All rights reserved. @@ -1277,7 +1277,7 @@ main(int ac, char **av) break; } } - if (!test_flag && !do_dump_cfg && !path_absolute(av[0])) + if (!test_flag && !inetd_flag && !do_dump_cfg && !path_absolute(av[0])) fatal("sshd requires execution with an absolute path"); closefrom(STDERR_FILENO + 1); -- 2.20.1