diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | contrib/cygwin/Makefile | 4 | ||||
-rw-r--r-- | contrib/cygwin/ssh-host-config | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20081201 | ||
2 | - (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files | ||
3 | and tweak the is-sshd-running check in ssh-host-config. Patch from | ||
4 | vinschen at redhat com. | ||
5 | |||
1 | 20081123 | 6 | 20081123 |
2 | - (dtucker) [monitor_fdpass.c] Reduce diff vs OpenBSD by moving some | 7 | - (dtucker) [monitor_fdpass.c] Reduce diff vs OpenBSD by moving some |
3 | declarations, removing an unnecessary union member and adding whitespace. | 8 | declarations, removing an unnecessary union member and adding whitespace. |
@@ -4931,5 +4936,5 @@ | |||
4931 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4936 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4932 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4937 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4933 | 4938 | ||
4934 | $Id: ChangeLog,v 1.5144 2008/11/23 08:05:53 dtucker Exp $ | 4939 | $Id: ChangeLog,v 1.5145 2008/12/01 10:34:28 dtucker Exp $ |
4935 | 4940 | ||
diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile index 3e2d26404..2ebd143dc 100644 --- a/contrib/cygwin/Makefile +++ b/contrib/cygwin/Makefile | |||
@@ -38,11 +38,13 @@ install-sshdoc: | |||
38 | $(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog | 38 | $(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog |
39 | $(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE | 39 | $(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE |
40 | $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW | 40 | $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW |
41 | $(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL | ||
42 | $(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent | ||
41 | $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README | 43 | $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README |
42 | $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns | 44 | $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns |
45 | $(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform | ||
43 | $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep | 46 | $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep |
44 | $(INSTALL) -m 644 $(srcdir)/README.smartcard $(DESTDIR)$(sshdocdir)/README.smartcard | 47 | $(INSTALL) -m 644 $(srcdir)/README.smartcard $(DESTDIR)$(sshdocdir)/README.smartcard |
45 | $(INSTALL) -m 644 $(srcdir)/RFC.nroff $(DESTDIR)$(sshdocdir)/RFC.nroff | ||
46 | $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO | 48 | $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO |
47 | $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG | 49 | $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG |
48 | 50 | ||
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index bbb6da4c4..2d367d314 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -456,7 +456,7 @@ done | |||
456 | 456 | ||
457 | # Check for running ssh/sshd processes first. Refuse to do anything while | 457 | # Check for running ssh/sshd processes first. Refuse to do anything while |
458 | # some ssh processes are still running | 458 | # some ssh processes are still running |
459 | if ps -ef | grep -v grep | grep -q ssh | 459 | if ps -ef | grep -q '/sshd\?$' |
460 | then | 460 | then |
461 | echo | 461 | echo |
462 | csih_error "There are still ssh processes running. Please shut them down first." | 462 | csih_error "There are still ssh processes running. Please shut them down first." |