Attachment 3201 Details for Bug 2922 – follow up fix

[patch] follow up fix

0001-Fix-hardcoded-sshd-service-name-in-Cygwin-installer-.patch (text/plain), 2.47 KB, created by Corinna Vinschen on 2018-11-09 20:35:34 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Corinna Vinschen

Created: 2018-11-09 20:35:34 AEDT

Size: 2.47 KB

patch

obsolete

>From 8b7c03eb5d3c763fba8efe3010bd6ce6341bfc38 Mon Sep 17 00:00:00 2001
>From: Christian Lupien <Christian.Lupien@USherbrooke.ca>
>Date: Fri, 9 Nov 2018 09:59:56 +0100
>Subject: [PATCH] Fix hardcoded sshd service name in Cygwin installer script
>
>---
> contrib/cygwin/ssh-host-config | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
>index 261020af33e8..2903125f8592 100644
>--- a/contrib/cygwin/ssh-host-config
>+++ b/contrib/cygwin/ssh-host-config
>@@ -307,7 +307,7 @@ check_service_files_ownership() {
> 
>   if [ -z "${run_service_as}" ]
>   then
>-    accnt_name=$(/usr/bin/cygrunsrv -VQ sshd |
>+    accnt_name=$(/usr/bin/cygrunsrv -VQ "${service_name}" |
>     		 /usr/bin/sed -ne 's/^Account *: *//gp')
>     if [ "${accnt_name}" = "LocalSystem" ]
>     then
>@@ -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
>-- 
>2.14.5
>

Actions: View | Diff

Attachments on bug 2922: 3195 | 3201