diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-04-19 22:16:53 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-04-19 22:16:53 +1000 |
commit | d04121f0ab2fcefb4b77523c38f8babadbebe38d (patch) | |
tree | e321300e8bdc6c809db9a3371a9cff9247d1501c | |
parent | dca6a4dd883ffe85bf3f67e6052e03217683d612 (diff) |
- djm@cvs.openbsd.org 2004/03/31 21:58:47
[canohost.c]
don't skip ip options check when UseDNS=no; ok markus@ (ID sync only)
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | canohost.c | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -9,6 +9,9 @@ | |||
9 | - djm@cvs.openbsd.org 2004/03/30 12:41:56 | 9 | - djm@cvs.openbsd.org 2004/03/30 12:41:56 |
10 | [sftp-client.c] | 10 | [sftp-client.c] |
11 | sync comment with reality | 11 | sync comment with reality |
12 | - djm@cvs.openbsd.org 2004/03/31 21:58:47 | ||
13 | [canohost.c] | ||
14 | don't skip ip options check when UseDNS=no; ok markus@ (ID sync only) | ||
12 | 15 | ||
13 | 20040418 | 16 | 20040418 |
14 | - (dtucker) [auth-pam.c] Log username and source host for failed PAM | 17 | - (dtucker) [auth-pam.c] Log username and source host for failed PAM |
@@ -994,4 +997,4 @@ | |||
994 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 997 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
995 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 998 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
996 | 999 | ||
997 | $Id: ChangeLog,v 1.3319 2004/04/19 12:10:52 dtucker Exp $ | 1000 | $Id: ChangeLog,v 1.3320 2004/04/19 12:16:53 dtucker Exp $ |
diff --git a/canohost.c b/canohost.c index a0067afc1..54369d49b 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: canohost.c,v 1.38 2003/09/23 20:17:11 markus Exp $"); | 15 | RCSID("$OpenBSD: canohost.c,v 1.39 2004/03/31 21:58:47 djm Exp $"); |
16 | 16 | ||
17 | #include "packet.h" | 17 | #include "packet.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |