summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2018-11-11 15:58:20 +1100
committerDarren Tucker <dtucker@dtucker.net>2018-11-11 15:58:20 +1100
commitf2970868f86161a22b2c377057fa3891863a692a (patch)
tree5b1bbfd3ebdcd155fb8b017101fa57f963619c8c /contrib
parentbd2d54fc1eee84bf87158a1277a50e6c8a303339 (diff)
downloadopenssh-git-f2970868f86161a22b2c377057fa3891863a692a.tar.gz
Improve warnings in cygwin service setup.
bz#2922, patch from vinschen at redhat.com.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/cygwin/ssh-host-config10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index e9f038db..2903125f 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -329,9 +329,9 @@ check_service_files_ownership() {
fi
if [ -z "${run_service_as}" ]
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 "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
fi
fi
@@ -367,8 +367,8 @@ check_service_files_ownership() {
if [ $ret -ne 0 ]
then
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 "you have suufficient permissions to change the ownership of files"
+ csih_warning "This may cause the ${service_name} service to fail! Please make sure that"
+ csih_warning "you have sufficient permissions to change the ownership of files"
csih_warning "and try to run the ssh-host-config script again."
fi
return $ret
@@ -446,7 +446,7 @@ install_service() {
echo
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 "\`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."
fi
else