Installing sshd on W7 reveals errors in CSIH_SCRIPT -- patch file

[Houder <houder@xs4all.nl>]

[-- Attachment #1: Type: text/plain, Size: 117 bytes --]

Hi,

For those of you who like to look at a patch file, the patch
file should have been attached to this post.

Henri

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: csih.patch --]
[-- Type: text/x-diff; name=csih.patch, Size: 1345 bytes --]

--- orig/cygwin-service-installation-helper.sh       2015-10-28 10:23:49.000000000 +0100
+++ new/cygwin-service-installation-helper.sh   2017-05-26 21:43:04.308202700 +0200
@@ -2566,7 +2566,7 @@
 #
 #     Otherwise, we need the files.
 #
-#   Returns 0 if files shall be used, 1 otherwise.
+#   Returns 1 if files shall be used, 0 otherwise.
 # ======================================================================
 csih_use_file_etc()
 {
@@ -3003,6 +3003,12 @@
          csih_inform "the '${csih_PRIVILEGED_USERNAME}' account."
          echo ""

+          # If we use /etc account DB only, write new account to /etc/passwd
+          if csih_use_file_etc passwd
+          then
+            /usr/bin/mkpasswd -l -u "${csih_PRIVILEGED_USERNAME}" >> "${SYSCONFDIR}/passwd"
+          fi
+
          if ! passwd -e "${csih_PRIVILEGED_USERNAME}" >/dev/null
          then
            csih_warning "Setting password expiry for user '${csih_PRIVILEGED_USERNAME}' failed!"
@@ -3063,12 +3069,6 @@
         fi
       fi

-      # If we use /etc account DB only, write new account to /etc/passwd
-      if csih_use_file_etc passwd
-      then
-       /usr/bin/mkpasswd -l -u "${username}" >> "${SYSCONFDIR}/passwd"
-      fi
-
       return "${ret}"
     fi # ! username_in_sam
     return 1 # failed to create user (or prevented by auto-answer veto)

[-- Attachment #3: Type: text/plain, Size: 219 bytes --]


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple