diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-09-12 02:36:27 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-09-12 02:37:34 +0200 |
| commit | c21c3a2419bbc1c59cb1a16ea356e703e99a90d9 (patch) | |
| tree | 46eecdc7321eeaad1bcd7aa01be199d7c3965c41 | |
| parent | upstream: document the mlkem768x25519-sha256 key exchange algorithm (diff) | |
| download | openssh-c21c3a2419bbc1c59cb1a16ea356e703e99a90d9.tar.xz openssh-c21c3a2419bbc1c59cb1a16ea356e703e99a90d9.zip | |
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
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |