diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-12-01 21:34:28 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-12-01 21:34:28 +1100 |
| commit | 83795d61d277df3f090f12336ea3e21b6946ef4f (patch) | |
| tree | 54e219332daeb747e3532dbdd8c14cc9fdb3042c /contrib | |
| parent | d3782b4e76481aaa12a32b7f239b815916615650 (diff) | |
- (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files
and tweak the is-sshd-running check in ssh-host-config. Patch from
vinschen at redhat com.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cygwin/Makefile | 4 | ||||
| -rw-r--r-- | contrib/cygwin/ssh-host-config | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile index 3e2d2640..2ebd143d 100644 --- a/contrib/cygwin/Makefile +++ b/contrib/cygwin/Makefile @@ -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 diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index bbb6da4c..2d367d31 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -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 -q '/sshd\?$' then echo csih_error "There are still ssh processes running. Please shut them down first." |