summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--contrib/cygwin/ssh-host-config6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 10dc20a1d..27d77d90d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH) 2 - (tim) [Makefile.in] use umask instead of chmod on $(PRIVSEP_PATH)
3 - (tim) [acconfig.h configure.ac sshd.c] 3 - (tim) [acconfig.h configure.ac sshd.c]
4 s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/ 4 s/BROKEN_FD_PASSING/DISABLE_FD_PASSING/
5 - (tim) [contrib/cygwin/ssh-host-config] sshd account creation fixes
6 patch from vinschen@redhat.com
5 7
620020705 820020705
7 - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. 9 - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs.
@@ -1285,4 +1287,4 @@
1285 - (stevesk) entropy.c: typo in debug message 1287 - (stevesk) entropy.c: typo in debug message
1286 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1288 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1287 1289
1288$Id: ChangeLog,v 1.2339 2002/07/07 20:43:36 tim Exp $ 1290$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 c263d60ff..590dbdebb 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -107,7 +107,7 @@ then
107 echo 107 echo
108 echo "There are still ssh processes running. Please shut them down first." 108 echo "There are still ssh processes running. Please shut them down first."
109 echo 109 echo
110 #exit 1 110 exit 1
111fi 111fi
112 112
113# Check for ${SYSCONFDIR} directory 113# Check for ${SYSCONFDIR} directory
@@ -340,7 +340,7 @@ then
340 if request "Shall this script create a local user 'sshd' on this machine?" 340 if request "Shall this script create a local user 'sshd' on this machine?"
341 then 341 then
342 dos_var_empty=`cygpath -w /var/empty` 342 dos_var_empty=`cygpath -w /var/empty`
343 net user sshd /add /fullname:"sshd privsep" "/HOMEDIR:$dos_var_empty" > /dev/null 2>&1 && sshd_in_sam=yes 343 net user sshd /add /fullname:"sshd privsep" "/homedir:$dos_var_empty" /active:no > /dev/null 2>&1 && sshd_in_sam=yes
344 if [ "$sshd_in_sam" != "yes" ] 344 if [ "$sshd_in_sam" != "yes" ]
345 then 345 then
346 echo "Warning: Creating the user 'sshd' failed!" 346 echo "Warning: Creating the user 'sshd' failed!"
@@ -354,7 +354,7 @@ then
354 echo " Check your ${SYSCONFDIR}/sshd_config file!" 354 echo " Check your ${SYSCONFDIR}/sshd_config file!"
355 privsep_used=no 355 privsep_used=no
356 else 356 else
357 mkpasswd -l -u sshd >> ${SYSCONFDIR}/passwd 357 mkpasswd -l -u sshd | sed -e 's/bash$/false/' >> ${SYSCONFDIR}/passwd
358 fi 358 fi
359 fi 359 fi
360 else 360 else