Skip to content

Commit

Permalink
upstream: Relax absolute path requirement back to what it was prior to
Browse files Browse the repository at this point in the history
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
  • Loading branch information
djmdjm committed Sep 12, 2024
1 parent 1bc426f commit c21c3a2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sshd.c
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c21c3a2

Please sign in to comment.