- (dtucker) [contrib/cygwin/ssh-host-config] Update to match current Cygwin

   install process.  Patch from vinschen at redhat.com.

diff --git a/ChangeLog b/ChangeLog
index ffb9ba7c7979e64bda9af450c45399bda816d4eb..3c66c76dc750e50641a77693a60dc9418a0d2f08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20040921
  - (dtucker) [openbsd-compat/bsd-snprintf.c] Check for max length too.
    ok djm@
+ - (dtucker) [contrib/cygwin/ssh-host-config] Update to match current Cygwin
+   install process.  Patch from vinschen at redhat.com.
 
 20040912
  - (djm) [loginrec.c] Start KNF and tidy up of this long-neglected file.

diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 9c0dabf41b4d4754da52a9a3d64fbb5b3f9a854e..c7164f610fb4bcf2319c8778e6fa0884c1a7c863 100644 (file)
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -449,7 +449,7 @@ then
          echo "Should this script create a new local account 'sshd_server' which has"
          if request "the required privileges?"
          then
-           _admingroup=`awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
+           _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
            if [ -z "${_admingroup}" ]
            then
              echo "There's no group with SID S-1-5-32-544 (Local administrators group) in"