From eb28cbc3996a7a6157f7637ed2270555a32cc292 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 3 Jun 2003 12:45:27 +1000
Subject: [PATCH]  - (dtucker) [port-aix.c bsd-cray.c] Fix uses of
 verify_reverse_mapping.

---
 ChangeLog                 | 3 ++-
 openbsd-compat/bsd-cray.c | 6 +++---
 openbsd-compat/port-aix.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dacdfbb00..1881189c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
  - (djm) Fix portable-specific uses of verify_reverse_mapping too
  - (djm) Sync openbsd-compat with OpenBSD CVS. 
     - No more 4-term BSD licenses in our tree
+ - (dtucker) [port-aix.c bsd-cray.c] Fix uses of verify_reverse_mapping.
 
 20030602
  - (djm) Fix segv from bad reordering in auth-pam.c
@@ -420,4 +421,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2767 2003/06/03 02:43:14 djm Exp $
+$Id: ChangeLog,v 1.2768 2003/06/03 02:45:27 dtucker Exp $
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index bff0fea3a..f2ac428cc 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.c,v 1.11 2003/05/18 14:13:38 djm Exp $
+ * $Id: bsd-cray.c,v 1.12 2003/06/03 02:45:27 dtucker Exp $
  *
  * bsd-cray.c
  *
@@ -103,7 +103,7 @@ cray_login_failure(char *username, int errcode)
 	memset(&fsent, '\0', sizeof(fsent));
 	fsent.revision = 0;
 	fsent.uname = username;
-	fsent.host = (char *)get_canonical_hostname(options.verify_reverse_mapping);
+	fsent.host = (char *)get_canonical_hostname(options.use_dns);
 	fsent.ttyn = "sshd";
 	fsent.caller = IA_SSHD;
 	fsent.flags = IA_INTERACTIVE;
@@ -199,7 +199,7 @@ cray_setup (uid_t uid, char *username, const char *command)
 	}
 	hostname[0] = '\0';
 	strlcpy(hostname,
-	   (char *)get_canonical_hostname(options.verify_reverse_mapping),
+	   (char *)get_canonical_hostname(options.use_dns),
 	   MAXHOSTNAMELEN);
 	/*
 	 *  Fetch user's UDB entry.
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index f192a4e79..b4c9454a1 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -68,7 +68,7 @@ aix_usrinfo(struct passwd *pw)
 void
 record_failed_login(const char *user, const char *ttyname)
 {
-	char *hostname = get_canonical_hostname(options.verify_reverse_mapping);
+	char *hostname = get_canonical_hostname(options.use_dns);
 
 	loginfailed(user, hostname, ttyname);
 }