diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-03-13 21:20:18 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-13 21:20:18 +1100 |
| commit | a21380b70e0a72ce20ec8ebd4f9bb1e03134ca22 (patch) | |
| tree | edbff707cab619a2b9eb88c6ee06558c12795ab1 | |
| parent | 835903da7bc133033186765c4a31421016de0895 (diff) | |
| download | openssh-git-a21380b70e0a72ce20ec8ebd4f9bb1e03134ca22.tar.gz | |
- (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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/cygwin/ssh-host-config | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,8 @@ +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. + 20050309 - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64 so that regress tests behave. From Chris Adams. @@ -2321,4 +2326,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.3708 2005/03/09 09:12:47 dtucker Exp $ +$Id: ChangeLog,v 1.3709 2005/03/13 10:20:18 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` |