From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 12 Sep 2024 00:36:27 +0000 (+0000)
Subject: upstream: Relax absolute path requirement back to what it was prior to
X-Git-Tag: V_9_9_P1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c21c3a2419bbc1c59cb1a16ea356e703e99a90d9;p=thirdparty%2Fopenssh-portable.git

upstream: 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

OpenBSD-Commit-ID: 25c57f22764897242d942853f8cccc5e991ea058
---

diff --git a/sshd.c b/sshd.c
index 7cce5ad3d..6827cedea 100644
--- a/sshd.c
+++ b/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.
@@ -1341,7 +1341,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);