[contrib/cygwin/ssh-host-config] sshd account creation fixes
patch from vinschen@redhat.com
diff --git a/ChangeLog b/ChangeLog
index 10dc20a..27d77d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH)
- (tim) [acconfig.h configure.ac sshd.c]
s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/
+ - (tim) [contrib/cygwin/ssh-host-config] sshd account creation fixes
+ patch from vinschen@redhat.com
20020705
- (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs.
@@ -1285,4 +1287,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2339 2002/07/07 20:43:36 tim Exp $
+$Id: ChangeLog,v 1.2340 2002/07/07 21:07:46 tim Exp $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index c263d60..590dbde 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -107,7 +107,7 @@
echo
echo "There are still ssh processes running. Please shut them down first."
echo
- #exit 1
+ exit 1
fi
# Check for ${SYSCONFDIR} directory
@@ -340,7 +340,7 @@
if request "Shall this script create a local user 'sshd' on this machine?"
then
dos_var_empty=`cygpath -w /var/empty`
- net user sshd /add /fullname:"sshd privsep" "/HOMEDIR:$dos_var_empty" > /dev/null 2>&1 && sshd_in_sam=yes
+ net user sshd /add /fullname:"sshd privsep" "/homedir:$dos_var_empty" /active:no > /dev/null 2>&1 && sshd_in_sam=yes
if [ "$sshd_in_sam" != "yes" ]
then
echo "Warning: Creating the user 'sshd' failed!"
@@ -354,7 +354,7 @@
echo " Check your ${SYSCONFDIR}/sshd_config file!"
privsep_used=no
else
- mkpasswd -l -u sshd >> ${SYSCONFDIR}/passwd
+ mkpasswd -l -u sshd | sed -e 's/bash$/false/' >> ${SYSCONFDIR}/passwd
fi
fi
else