[PATCH/cygwin] Fix cygwin specific Makefile and a bug in the ssh-host-config script

[Corinna Vinschen]

Hi,

could somebody be so kind to check in the follwoing patch?  It fixes
two problems:

- contrib/cygwin/Makefile:

  Installs new docs and stops trying to install RFC.nroff.

- contrib/cygwin/ssh-host-config:

  Fixes a condition which tries to find out if ssh or sshd processes are
  still running.  The old version unfortunately stumbles over user names
  which contain the substring "ssh" :}


Thanks in advance,
Corinna


Index: contrib/cygwin/Makefile
===================================================================
RCS file: /cvs/openssh/contrib/cygwin/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- contrib/cygwin/Makefile	14 Jul 2008 02:12:54 -0000	1.3
+++ contrib/cygwin/Makefile	7 Nov 2008 10:49:30 -0000
@@ -38,11 +38,13 @@ install-sshdoc:
 	$(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog
 	$(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE
 	$(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW
+	$(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL
+	$(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent
 	$(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README
 	$(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns
+	$(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform
 	$(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep
 	$(INSTALL) -m 644 $(srcdir)/README.smartcard $(DESTDIR)$(sshdocdir)/README.smartcard
-	$(INSTALL) -m 644 $(srcdir)/RFC.nroff $(DESTDIR)$(sshdocdir)/RFC.nroff
 	$(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO
 	$(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG
 
Index: contrib/cygwin/ssh-host-config
===================================================================
RCS file: /cvs/openssh/contrib/cygwin/ssh-host-config,v
retrieving revision 1.22
diff -u -p -r1.22 ssh-host-config
--- contrib/cygwin/ssh-host-config	14 Jul 2008 02:12:54 -0000	1.22
+++ contrib/cygwin/ssh-host-config	7 Nov 2008 10:49:30 -0000
@@ -456,7 +456,7 @@ done
 
 # Check for running ssh/sshd processes first. Refuse to do anything while
 # some ssh processes are still running
-if ps -ef | grep -v grep | grep -q ssh
+if ps -ef | grep -v grep | grep -q 'sshd*$'
 then
   echo
   csih_error "There are still ssh processes running. Please shut them down first."


-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat