[vcl] branch VCL-1127_updates_for_cygsshd updated: VCL-1127 - Make changes to handle Cygwin's change of sshd service name to cygsshd

[jfthomps]

This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch VCL-1127_updates_for_cygsshd
in repository https://gitbox.apache.org/repos/asf/vcl.git


The following commit(s) were added to refs/heads/VCL-1127_updates_for_cygsshd 
by this push:
     new 7a6a7ed  VCL-1127 - Make changes to handle Cygwin's change of sshd 
service name to cygsshd
7a6a7ed is described below

commit 7a6a7ed71be793f8b5bccc19a9635d997d02d2f4
Author: Josh Thompson <jftho...@ncsu.edu>
AuthorDate: Thu Jun 11 16:44:47 2020 -0400

    VCL-1127 - Make changes to handle Cygwin's change of sshd service name to 
cygsshd
    
    cygsshd-sshd-config.sh: changed method to determine value for sshdservice; 
set default value if attempt to determine value returns an empty string to 
cygsshd rather than sshd
---
 managementnode/bin/cygwin-sshd-config.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/managementnode/bin/cygwin-sshd-config.sh 
b/managementnode/bin/cygwin-sshd-config.sh
index 88a84b1..c5f874d 100755
--- a/managementnode/bin/cygwin-sshd-config.sh
+++ b/managementnode/bin/cygwin-sshd-config.sh
@@ -131,10 +131,10 @@ if [ $? -ne 0 ]; then die "failed to configure / mount 
point"; fi;
 mount
 print_hr
 
-sshdservice=$(sc queryex type=service state=all | grep sshd | grep 
SERVICE_NAME | awk '{print $2}' | sed 's/
//g')
+sshdservice=$(grep ^service_name /usr/bin/ssh-host-config | awk -F'=' '{print 
$2}')
 
 if [[ $sshdservice == "" ]]; then
-       sshdservice=sshd
+       sshdservice=cygsshd
 fi
 
 echo "sshd service name is $sshdservice"