--- /usr/src/openssh-5.2p1-1/contrib/cygwin/ssh-host-config	2009-01-29 20:40:30.001000000 +0000
+++ ssh-host-config	2009-03-24 15:09:30.000000000 +0000
@@ -287,6 +287,9 @@
 	  csih_inform "sshd requires.  You need to have or to create a privileged"
 	  csih_inform "account.  This script will help you do so."
 	  echo
+	  
+	  # Try to discover a privileged user, if possible the one already used by sshd
+	  csih_select_privileged_username ${with_force} sshd
 	  if ! csih_create_privileged_user "${password_value}"
 	  then
 	    csih_error_recoverable "There was a serious problem creating a privileged user."
@@ -432,6 +435,10 @@
     csih_FORCE_PRIVILEGED_USER=yes
     ;;
 
+  -f | --force )
+    with_force=-f
+    ;;
+    
   *)
     echo "usage: ${progname} [OPTION]..."
     echo
@@ -441,6 +448,7 @@
     echo "  --debug  -d            Enable shell's debug output."
     echo "  --yes    -y            Answer all questions with \"yes\" automatically."
     echo "  --no     -n            Answer all questions with \"no\" automatically."
+    echo "  --force  -f            Don't ask confirmation for sshd account name."
     echo "  --cygwin -c <options>  Use \"options\" as value for CYGWIN environment var."
     echo "  --port   -p <n>        sshd listens on port n."
     echo "  --pwd    -w <passwd>   Use \"pwd\" as password for privileged user."
@@ -489,7 +497,7 @@
 fi
 
 # Create /var/empty file used as chroot jail for privilege separation
-csih_make_dir "${LOCALSTATEDIR}/empty" "Cannot create log directory."
+csih_make_dir "${LOCALSTATEDIR}/empty" "Cannot create chroot jail base directory."
 chmod 755 "${LOCALSTATEDIR}/empty"
 setfacl -m u:system:rwx "${LOCALSTATEDIR}/empty"