summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-09-21 21:35:55 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-09-21 21:35:55 +1000
commit5d596139d43743004524a23693851211d3327718 (patch)
tree437322da3f4b98012227ee0d0b8b4cf289ce6469
parent50fbb45dbd2f95f95c959dc03663b213b4aac2aa (diff)
- (dtucker) [contrib/cygwin/ssh-host-config] Update to match current Cygwin
install process. Patch from vinschen at redhat.com.
-rw-r--r--ChangeLog4
-rw-r--r--contrib/cygwin/ssh-host-config2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 982e229a..efcb44c0 100644
--- 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.
@@ -1748,4 +1750,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.3553 2004/09/21 11:32:12 dtucker Exp $
+$Id: ChangeLog,v 1.3554 2004/09/21 11:35:55 dtucker Exp $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 9c0dabf4..c7164f61 100644
--- 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"