diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-03-14 23:04:51 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-14 23:04:51 +1100 |
| commit | 72c9065566a195852cbe7844178fe5215d0eec72 (patch) | |
| tree | 6a1de178d7302cbc8d88baa1cbad8710af26896a | |
| parent | 2133d4630bb973b1f55a30962b506cdcc21604e4 (diff) | |
- (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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/cygwin/ssh-host-config | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -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 @@ -2333,4 +2338,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3707.2.3 2005/03/14 11:58:11 dtucker Exp $ +$Id: ChangeLog,v 1.3707.2.4 2005/03/14 12:04:51 dtucker Exp $ diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index c7164f61..b41a2e49 100644 --- 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` |