From d04121f0ab2fcefb4b77523c38f8babadbebe38d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 19 Apr 2004 22:16:53 +1000
Subject: [PATCH]    - 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)

---
 ChangeLog  | 5 ++++-
 canohost.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a72f4c46..03abd686e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
    - djm@cvs.openbsd.org 2004/03/30 12:41:56
      [sftp-client.c]
      sync comment with reality
+   - 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)
 
 20040418
  - (dtucker) [auth-pam.c] Log username and source host for failed PAM
@@ -994,4 +997,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3319 2004/04/19 12:10:52 dtucker Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.38 2003/09/23 20:17:11 markus Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.39 2004/03/31 21:58:47 djm Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"