Improve warnings in cygwin service setup.

bz#2922, patch from vinschen at redhat.com.

diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index e9f038db54b01a25e958f9ba0ef7a7a4f191d45c..2903125f8592fd01d39653f45783f2bc4384a7a6 100644 (file)
--- 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