- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.

   Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x.
   The information given for the setting of the CYGWIN environment variable
   is wrong for both releases so I just removed it, together with the
   unnecessary (Cygwin 1.5.x) or wrong (Cygwin 1.7.x) default setting.

diff --git a/ChangeLog b/ChangeLog
index ee79119fa1ea27b20dce70c34fa493f7007b5932..8679e176d76da3187d8aa7a3e4affaa5ee20528b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20090128
+ - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
+   Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x.
+   The information given for the setting of the CYGWIN environment variable
+   is wrong for both releases so I just removed it, together with the
+   unnecessary (Cygwin 1.5.x) or wrong (Cygwin 1.7.x) default setting.
+
 20081228
  - (djm) OpenBSD CVS Sync
    - stevesk@cvs.openbsd.org 2008/12/09 03:20:42

diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 2d367d314b54e876929e495dbc38857a1f44c482..d4f5f32d006e545506ffaea1ded772b5e17d1e74 100644 (file)
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -25,7 +25,7 @@ source ${CSIH_SCRIPT}
 port_number=22
 privsep_configured=no
 privsep_used=yes
-cygwin_value="ntsec"
+cygwin_value=""
 password_value=
 
 # ======================================================================
@@ -76,7 +76,7 @@ update_services_file() {
   fi
   _serv_tmp="${_my_etcdir}/srv.out.$$"
   
-  mount -t -f "${_win_etcdir}" "${_my_etcdir}"
+  mount -o text -f "${_win_etcdir}" "${_my_etcdir}"
   
   # Depends on the above mount
   _wservices=`cygpath -w "${_services}"`
@@ -278,8 +278,6 @@ install_service() {
       echo -e "${_csih_QUERY_STR} Do you want to install sshd as a service?"
       if csih_request "(Say \"no\" if it is already installed as a service)"
       then
-       csih_inform "Note that the CYGWIN variable must contain at least \"ntsec\""
-        csih_inform "for sshd to be able to change user context without password."
         csih_get_cygenv "${cygwin_value}"
 
         if ( csih_is_nt2003 || [ "$csih_FORCE_PRIVILEGED_USER" = "yes" ] )