[PATCH] Patch by Florian Friesdorf <flo at chaoflow.net>: contrib/cygwin/ssh-host-config: Add -N option to allow different service name.

[Damien Miller]

applied - thanks

On Mon, 17 Nov 2014, Corinna Vinschen wrote:

> Ping?
> 
> 
> Thanks,
> Corinna
> 
> On Nov  6 18:00, Corinna Vinschen wrote:
> > Hi,
> > 
> > today I got a neat patch to ssh-host-config.  With the new -N option it
> > allows to install multiple sshd services under different service names.
> > I like the idea, so I thought I send the patch upstream.  See below.
> > 
> > 
> > Thanks,
> > Corinna
> > 
> > 
> > ---
> >  contrib/cygwin/ssh-host-config | 19 +++++++++++++------
> >  1 file changed, 13 insertions(+), 6 deletions(-)
> >  mode change 100644 => 100755 contrib/cygwin/ssh-host-config
> > 
> > diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
> > old mode 100644
> > new mode 100755
> > index 3214829..d934d09
> > --- a/contrib/cygwin/ssh-host-config
> > +++ b/contrib/cygwin/ssh-host-config
> > @@ -61,6 +61,7 @@ LOCALSTATEDIR=/var
> >  
> >  sshd_config_configured=no
> >  port_number=22
> > +service_name=sshd
> >  strictmodes=yes
> >  privsep_used=yes
> >  cygwin_value=""
> > @@ -408,7 +409,7 @@ install_service() {
> >    local ret=0
> >  
> >    echo
> > -  if /usr/bin/cygrunsrv -Q sshd >/dev/null 2>&1
> > +  if /usr/bin/cygrunsrv -Q ${service_name} >/dev/null 2>&1
> >    then
> >      csih_inform "Sshd service is already installed."
> >      check_service_files_ownership "" || let ret+=$?
> > @@ -464,7 +465,7 @@ install_service() {
> >        fi
> >        if [ -z "${password}" ]
> >        then
> > -	if /usr/bin/cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd \
> > +	if /usr/bin/cygrunsrv -I ${service_name} -d "CYGWIN ${service_name}" -p /usr/sbin/sshd \
> >  			      -a "-D" -y tcpip "${cygwin_env[@]}"
> >  	then
> >  	  echo
> > @@ -474,20 +475,20 @@ install_service() {
> >  	  csih_inform "will start automatically after the next reboot."
> >  	fi
> >        else
> > -	if /usr/bin/cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd \
> > +	if /usr/bin/cygrunsrv -I ${service_name} -d "CYGWIN ${service_name}" -p /usr/sbin/sshd \
> >  			      -a "-D" -y tcpip "${cygwin_env[@]}" \
> >  			      -u "${run_service_as}" -w "${password}"
> >  	then
> >  	  /usr/bin/editrights -u "${run_service_as}" -a SeServiceLogonRight
> >  	  echo
> >  	  csih_inform "The sshd service has been installed under the '${run_service_as}'"
> > -	  csih_inform "account.  To start the service now, call \`net start sshd' or"
> > -	  csih_inform "\`cygrunsrv -S sshd'.  Otherwise, it will start automatically"
> > +	  csih_inform "account.  To start the service now, call \`net start ${service_name}' or"
> > +	  csih_inform "\`cygrunsrv -S ${service_name}'.  Otherwise, it will start automatically"
> >  	  csih_inform "after the next reboot."
> >  	fi
> >        fi
> >  
> > -      if /usr/bin/cygrunsrv -Q sshd >/dev/null 2>&1
> > +      if /usr/bin/cygrunsrv -Q ${service_name} >/dev/null 2>&1
> >        then
> >  	check_service_files_ownership "${run_service_as}" || let ret+=$?
> >        else
> > @@ -561,6 +562,11 @@ do
> >      shift
> >      ;;
> >  
> > +  -N | --name )
> > +    service_name=$1
> > +    shift
> > +    ;;
> > +
> >    -p | --port )
> >      port_number=$1
> >      shift
> > @@ -590,6 +596,7 @@ do
> >      echo "  --yes    -y            Answer all questions with \"yes\" automatically."
> >      echo "  --no     -n            Answer all questions with \"no\" automatically."
> >      echo "  --cygwin -c <options>  Use \"options\" as value for CYGWIN environment var."
> > +    echo "  --name   -N <name>     sshd windows service name."
> >      echo "  --port   -p <n>        sshd listens on port n."
> >      echo "  --user   -u <account>  privileged user for service, default 'cyg_server'."
> >      echo "  --pwd    -w <passwd>   Use \"pwd\" as password for privileged user."
> 
> -- 
> Corinna Vinschen
> Cygwin Maintainer
> Red Hat
>