tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cygwin: only tweak sshd_config file if it's new, drop creating sshd user 

The sshd_config tweaks were executed even if the old file was
still in place.  Fix that.  Also disable sshd user creation.
It's not used on Cygwin.
This commit is contained in:
Corinna Vinschen 2019-01-26 23:42:40 +01:00 committed by Damien Miller
parent 89843de0c4
commit 1d05b4adcb
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/cygwin/ssh-host-config
View File

@ -669,14 +669,24 @@ then
fi fi
# handle sshd_config # handle sshd_config
# make sure not to change the existing file
mod_before=""
if [ -e "${SYSCONFDIR}/sshd_config" ]
then
mod_before=$(stat "${SYSCONFDIR}/sshd_config" | grep '^Modify:')
fi
csih_install_config "${SYSCONFDIR}/sshd_config" "${SYSCONFDIR}/defaults" || let ++warning_cnt csih_install_config "${SYSCONFDIR}/sshd_config" "${SYSCONFDIR}/defaults" || let ++warning_cnt
mod_now=$(stat "${SYSCONFDIR}/sshd_config" | grep '^Modify:')
if ! /usr/bin/cmp "${SYSCONFDIR}/sshd_config" "${SYSCONFDIR}/defaults/${SYSCONFDIR}/sshd_config" >/dev/null 2>&1 if ! /usr/bin/cmp "${SYSCONFDIR}/sshd_config" "${SYSCONFDIR}/defaults/${SYSCONFDIR}/sshd_config" >/dev/null 2>&1
then then
sshd_config_configured=yes sshd_config_configured=yes
fi fi
if [ "${mod_before}" != "${mod_now}" ]
then
sshd_strictmodes || let warning_cnt+=$? sshd_strictmodes || let warning_cnt+=$?
sshd_privsep || let warning_cnt+=$?
sshd_config_tweak || let warning_cnt+=$? sshd_config_tweak || let warning_cnt+=$?
fi
#sshd_privsep || let warning_cnt+=$?
update_services_file || let warning_cnt+=$? update_services_file || let warning_cnt+=$?
update_inetd_conf || let warning_cnt+=$? update_inetd_conf || let warning_cnt+=$?
install_service || let warning_cnt+=$? install_service || let warning_cnt+=$?