- (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.
This commit is contained in:
Darren Tucker 2005-03-13 21:20:18 +11:00
parent 835903da7b
commit a21380b70e
2 changed files with 8 additions and 5 deletions

View File

@ -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 20050309
- (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64 - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64
so that regress tests behave. From Chris Adams. so that regress tests behave. From Chris Adams.
@ -2321,4 +2326,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

View File

@ -449,12 +449,10 @@ then
echo "Should this script create a new local account 'sshd_server' which has" echo "Should this script create a new local account 'sshd_server' which has"
if request "the required privileges?" if request "the required privileges?"
then 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}" ] if [ -z "${_admingroup}" ]
then then
echo "There's no group with SID S-1-5-32-544 (Local administrators group) in" echo "mkgroup -l produces no group with SID S-1-5-32-544 (Local administrators group)."
echo "your ${SYSCONFDIR}/group file. Please regenerate this entry using 'mkgroup -l'"
echo "and restart this script."
exit 1 exit 1
fi fi
dos_var_empty=`cygpath -w ${LOCALSTATEDIR}/empty` dos_var_empty=`cygpath -w ${LOCALSTATEDIR}/empty`