From a21380b70e0a72ce20ec8ebd4f9bb1e03134ca22 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 13 Mar 2005 21:20:18 +1100
Subject:  - (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.

---
 contrib/cygwin/ssh-host-config | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'contrib/cygwin/ssh-host-config')

diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index c7164f610..b41a2e49b 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`
-- 
cgit v1.2.3


From fa2211d93d3ad66ec16e4d23a14e5730a105c559 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 9 May 2005 23:48:17 +1000
Subject:  - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning
 for a    user-mode mounts in Cygwin installation.  Patch from vinschen at
 redhat.com.

---
 ChangeLog                      |  6 +++++-
 contrib/cygwin/ssh-host-config | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'contrib/cygwin/ssh-host-config')

diff --git a/ChangeLog b/ChangeLog
index bee07796c..a84435296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050509
+ - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning for a
+   user-mode mounts in Cygwin installation.  Patch from vinschen at redhat.com.
+
 20050504
  - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used
    unix domain socket, so catch that too; from jakob@ ok dtucker@
@@ -2474,4 +2478,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.3753 2005/05/04 05:33:09 djm Exp $
+$Id: ChangeLog,v 1.3754 2005/05/09 13:48:17 dtucker Exp $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index b41a2e49b..fbfb5c195 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -583,6 +583,16 @@ then
 	chown "${_user}".544 ${LOCALSTATEDIR}/log/sshd.log
       fi
     fi
+    if ! ( mount | egrep -q 'on /(|usr/(bin|lib)) type system' )
+    then
+      echo
+      echo "Warning: It appears that you have user mode mounts (\"Just me\""
+      echo "chosen during install.)  Any daemons installed as services will"
+      echo "fail to function unless system mounts are used.  To change this,"
+      echo "re-run setup.exe and choose \"All users\"."
+      echo
+      echo "For more information, see http://cygwin.com/faq/faq0.html#TOC33"
+    fi
   fi
 fi
 
-- 
cgit v1.2.3