diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rwxr-xr-x | opensshd.init.in | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20060129 | ||
2 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the | ||
3 | opensshd.init script interpretter if /sbin/sh does not exist. ok tim@ | ||
4 | |||
1 | 20060120 | 5 | 20060120 |
2 | - (dtucker) OpenBSD CVS Sync | 6 | - (dtucker) OpenBSD CVS Sync |
3 | - jmc@cvs.openbsd.org 2006/01/15 17:37:05 | 7 | - jmc@cvs.openbsd.org 2006/01/15 17:37:05 |
@@ -3718,4 +3722,4 @@ | |||
3718 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3722 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3719 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3723 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3720 | 3724 | ||
3721 | $Id: ChangeLog,v 1.4093 2006/01/20 00:31:47 dtucker Exp $ | 3725 | $Id: ChangeLog,v 1.4094 2006/01/29 13:22:39 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index a9654cbde..70e26deea 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.321 2006/01/01 10:03:30 djm Exp $ | 1 | # $Id: configure.ac,v 1.322 2006/01/29 13:22:39 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -47,6 +47,11 @@ AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd, | |||
47 | AC_PATH_PROG(PATH_USERADD_PROG, useradd, useradd, | 47 | AC_PATH_PROG(PATH_USERADD_PROG, useradd, useradd, |
48 | [/usr/sbin${PATH_SEPARATOR}/etc]) | 48 | [/usr/sbin${PATH_SEPARATOR}/etc]) |
49 | AC_CHECK_PROG(MAKE_PACKAGE_SUPPORTED, pkgmk, yes, no) | 49 | AC_CHECK_PROG(MAKE_PACKAGE_SUPPORTED, pkgmk, yes, no) |
50 | if test -x /sbin/sh; then | ||
51 | AC_SUBST(STARTUP_SCRIPT_SHELL,/sbin/sh) | ||
52 | else | ||
53 | AC_SUBST(STARTUP_SCRIPT_SHELL,/bin/sh) | ||
54 | fi | ||
50 | 55 | ||
51 | # System features | 56 | # System features |
52 | AC_SYS_LARGEFILE | 57 | AC_SYS_LARGEFILE |
diff --git a/opensshd.init.in b/opensshd.init.in index ffa7cdac2..c36c5c88a 100755 --- a/opensshd.init.in +++ b/opensshd.init.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/sbin/sh | 1 | #!@STARTUP_SCRIPT_SHELL@ |
2 | # Donated code that was put under PD license. | 2 | # Donated code that was put under PD license. |
3 | # | 3 | # |
4 | # Stripped PRNGd out of it for the time being. | 4 | # Stripped PRNGd out of it for the time being. |