[openssh-commits] [openssh] branch master updated: upstream: Relax absolute path requirement back to what it was prior to

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new c21c3a24 upstream: Relax absolute path requirement back to what it was prior to
c21c3a24 is described below

commit c21c3a2419bbc1c59cb1a16ea356e703e99a90d9
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Thu Sep 12 00:36:27 2024 +0000

    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
---
 sshd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sshd.c b/sshd.c
index 7cce5ad3..6827cede 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.