diff options
Diffstat (limited to 'contrib/cygwin/ssh-host-config')
-rw-r--r-- | contrib/cygwin/ssh-host-config | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index 18793ca85..9c0dabf41 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -263,7 +263,7 @@ then | |||
263 | net user sshd >/dev/null 2>&1 && sshd_in_sam=yes | 263 | net user sshd >/dev/null 2>&1 && sshd_in_sam=yes |
264 | if [ "${sshd_in_passwd}" != "yes" ] | 264 | if [ "${sshd_in_passwd}" != "yes" ] |
265 | then | 265 | then |
266 | if [ "${sshd_in_sam}" != "yes" ] | 266 | if [ "${sshd_in_sam}" != "yes" ] |
267 | then | 267 | then |
268 | echo "Warning: The following function requires administrator privileges!" | 268 | echo "Warning: The following function requires administrator privileges!" |
269 | if request "Should this script create a local user 'sshd' on this machine?" | 269 | if request "Should this script create a local user 'sshd' on this machine?" |
@@ -339,13 +339,13 @@ if [ `grep -q 'sshd[ \t][ \t]*22' "${_services}"; echo $?` -eq 0 ] | |||
339 | then | 339 | then |
340 | grep -v 'sshd[ \t][ \t]*22' "${_services}" > "${_serv_tmp}" | 340 | grep -v 'sshd[ \t][ \t]*22' "${_services}" > "${_serv_tmp}" |
341 | if [ -f "${_serv_tmp}" ] | 341 | if [ -f "${_serv_tmp}" ] |
342 | then | 342 | then |
343 | if mv "${_serv_tmp}" "${_services}" | 343 | if mv "${_serv_tmp}" "${_services}" |
344 | then | 344 | then |
345 | echo "Removing sshd from ${_wservices}" | 345 | echo "Removing sshd from ${_wservices}" |
346 | else | 346 | else |
347 | echo "Removing sshd from ${_wservices} failed!" | 347 | echo "Removing sshd from ${_wservices} failed!" |
348 | fi | 348 | fi |
349 | rm -f "${_serv_tmp}" | 349 | rm -f "${_serv_tmp}" |
350 | else | 350 | else |
351 | echo "Removing sshd from ${_wservices} failed!" | 351 | echo "Removing sshd from ${_wservices} failed!" |
@@ -388,9 +388,9 @@ then | |||
388 | then | 388 | then |
389 | if mv "${_inetcnf_tmp}" "${_inetcnf}" | 389 | if mv "${_inetcnf_tmp}" "${_inetcnf}" |
390 | then | 390 | then |
391 | echo "Removed sshd from ${_inetcnf}" | 391 | echo "Removed sshd from ${_inetcnf}" |
392 | else | 392 | else |
393 | echo "Removing sshd from ${_inetcnf} failed!" | 393 | echo "Removing sshd from ${_inetcnf} failed!" |
394 | fi | 394 | fi |
395 | rm -f "${_inetcnf_tmp}" | 395 | rm -f "${_inetcnf_tmp}" |
396 | else | 396 | else |
@@ -462,7 +462,7 @@ then | |||
462 | do | 462 | do |
463 | if [ -n "${password_value}" ] | 463 | if [ -n "${password_value}" ] |
464 | then | 464 | then |
465 | _password="${password_value}" | 465 | _password="${password_value}" |
466 | # Allow to ask for password if first try fails | 466 | # Allow to ask for password if first try fails |
467 | password_value="" | 467 | password_value="" |
468 | else | 468 | else |
@@ -541,7 +541,7 @@ then | |||
541 | fi | 541 | fi |
542 | if [ -n "${cygwin_value}" ] | 542 | if [ -n "${cygwin_value}" ] |
543 | then | 543 | then |
544 | _cygwin="${cygwin_value}" | 544 | _cygwin="${cygwin_value}" |
545 | else | 545 | else |
546 | echo | 546 | echo |
547 | echo "Which value should the environment variable CYGWIN have when" | 547 | echo "Which value should the environment variable CYGWIN have when" |
@@ -574,9 +574,9 @@ then | |||
574 | then | 574 | then |
575 | if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] | 575 | if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] |
576 | then | 576 | then |
577 | _user="sshd_server" | 577 | _user="sshd_server" |
578 | else | 578 | else |
579 | _user="system" | 579 | _user="system" |
580 | fi | 580 | fi |
581 | chown "${_user}" ${SYSCONFDIR}/ssh* | 581 | chown "${_user}" ${SYSCONFDIR}/ssh* |
582 | chown "${_user}".544 ${LOCALSTATEDIR}/empty | 582 | chown "${_user}".544 ${LOCALSTATEDIR}/empty |