[src/netbsd-6-0]: src/crypto/external/bsd/openssh/dist Pull up following revi...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fa2b052b2b2
branches:  netbsd-6-0
changeset: 775006:6fa2b052b2b2
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Nov 03 21:31:54 2014 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1169):
        crypto/external/bsd/openssh/dist/auth.c: revision 1.9
for consistency use options.use_dns when getting the canonical hostname.
[we do the same below for hosts.allow and deny] reported by rudolf.

diffstat:

 crypto/external/bsd/openssh/dist/auth.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r cf6dffe10ea9 -r 6fa2b052b2b2 crypto/external/bsd/openssh/dist/auth.c
--- a/crypto/external/bsd/openssh/dist/auth.c   Mon Nov 03 16:47:29 2014 +0000
+++ b/crypto/external/bsd/openssh/dist/auth.c   Mon Nov 03 21:31:54 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth.c,v 1.5 2011/09/07 17:49:19 christos Exp $        */
+/*     $NetBSD: auth.c,v 1.5.10.1 2014/11/03 21:31:54 msaitoh Exp $    */
 /* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth.c,v 1.5 2011/09/07 17:49:19 christos Exp $");
+__RCSID("$NetBSD: auth.c,v 1.5.10.1 2014/11/03 21:31:54 msaitoh Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -99,7 +99,7 @@
                return 0;
 
 #ifdef HAVE_LOGIN_CAP
-       hostname = get_canonical_hostname(1);
+       hostname = get_canonical_hostname(options.use_dns);
        ipaddr = get_remote_ipaddr();
 
        lc = login_getclass(pw->pw_class);