- (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the

   localized name of the local administrators group more reliable.  From
   vinschen at redhat.com.

(sync with HEAD)

diff --git a/ChangeLog b/ChangeLog
index 6b09c1ae94f8db46261fdd3c2ed14593239f492f..22eb47d85df77e29d8fde38def22fbbb945371ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
      Check listen addresses for null, prevents xfree from dying during
      ClearAllForwardings (bz #996).  From  Craig Leres, ok markus@
 
+20050313
+ - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
+   localized name of the local administrators group more reliable.  From
+   vinschen at redhat.com.
+
 20050312
  - (dtucker) [regress/test-exec.sh] DEBUG can cause problems where debug
    output ends up in the client's output, causing regress failures.  Found

diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index c7164f610fb4bcf2319c8778e6fa0884c1a7c863..b41a2e49b65f47be3fc13328757780ab73222c5a 100644 (file)
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -449,12 +449,10 @@ then
          echo "Should this script create a new local account 'sshd_server' which has"
          if request "the required privileges?"
          then
-           _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
+           _admingroup=`mkgroup -l | awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' `
            if [ -z "${_admingroup}" ]
            then
-             echo "There's no group with SID S-1-5-32-544 (Local administrators group) in"
-             echo "your ${SYSCONFDIR}/group file.  Please regenerate this entry using 'mkgroup -l'"
-             echo "and restart this script."
+             echo "mkgroup -l produces no group with SID S-1-5-32-544 (Local administrators group)."
              exit 1
            fi
            dos_var_empty=`cygpath -w ${LOCALSTATEDIR}/empty`