summaryrefslogtreecommitdiff
path: root/contrib/cygwin
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2009-01-28 12:50:04 -0800
committerTim Rice <tim@multitalents.net>2009-01-28 12:50:04 -0800
commitca3692d1a9f8c384d3cf799369dcb9c54bb5ec55 (patch)
tree043634098a2e191da9159681d5cd177abbc35aef /contrib/cygwin
parent13ae44ce5865b720708aae9cb1d2e2f08a0d90cb (diff)
downloadopenssh-git-ca3692d1a9f8c384d3cf799369dcb9c54bb5ec55.tar.gz
- (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.
Diffstat (limited to 'contrib/cygwin')
-rw-r--r--contrib/cygwin/ssh-host-config6
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 2d367d31..d4f5f32d 100644
--- 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" ] )