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

Improve warnings in cygwin service setup. 

bz#2922, patch from vinschen at redhat.com.
This commit is contained in:
Darren Tucker 2018-11-11 15:58:20 +11:00
parent bd2d54fc1e
commit f2970868f8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,9 +329,9 @@ check_service_files_ownership() {
fi fi
if [ -z "${run_service_as}" ] if [ -z "${run_service_as}" ]
then then
csih_warning "Couldn't determine name of user running sshd service from account database!" csih_warning "Couldn't determine name of user running ${service_name} service from account database!"
csih_warning "As a result, this script cannot make sure that the files used" csih_warning "As a result, this script cannot make sure that the files used"
csih_warning "by the sshd service belong to the user running the service." csih_warning "by the ${service_name} service belong to the user running the service."
return 1 return 1
fi fi
fi fi
@ -367,8 +367,8 @@ check_service_files_ownership() {
if [ $ret -ne 0 ] if [ $ret -ne 0 ]
then then
csih_warning "Couldn't change owner of important files to ${run_service_as}!" csih_warning "Couldn't change owner of important files to ${run_service_as}!"
csih_warning "This may cause the sshd service to fail! Please make sure that" csih_warning "This may cause the ${service_name} service to fail! Please make sure that"
csih_warning "you have suufficient permissions to change the ownership of files" csih_warning "you have sufficient permissions to change the ownership of files"
csih_warning "and try to run the ssh-host-config script again." csih_warning "and try to run the ssh-host-config script again."
fi fi
return $ret return $ret
@ -446,7 +446,7 @@ install_service() {
echo echo
csih_inform "The sshd service has been installed under the LocalSystem" csih_inform "The sshd service has been installed under the LocalSystem"
csih_inform "account (also known as SYSTEM). To start the service now, call" csih_inform "account (also known as SYSTEM). To start the service now, call"
csih_inform "\`net start sshd' or \`cygrunsrv -S sshd'. Otherwise, it" csih_inform "\`net start ${service_name}' or \`cygrunsrv -S ${service_name}'. Otherwise, it"
csih_inform "will start automatically after the next reboot." csih_inform "will start automatically after the next reboot."
fi fi
else else