Module Name: src
Committed By: msaitoh
Date: Mon Nov 3 21:30:58 UTC 2014
Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-6]: auth.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/crypto/external/bsd/openssh/dist/auth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/auth.c
diff -u src/crypto/external/bsd/openssh/dist/auth.c:1.5 src/crypto/external/bsd/openssh/dist/auth.c:1.5.4.1
--- src/crypto/external/bsd/openssh/dist/auth.c:1.5 Wed Sep 7 17:49:19 2011
+++ src/crypto/external/bsd/openssh/dist/auth.c Mon Nov 3 21:30:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.c,v 1.5 2011/09/07 17:49:19 christos Exp $ */
+/* $NetBSD: auth.c,v 1.5.4.1 2014/11/03 21:30:58 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.4.1 2014/11/03 21:30:58 msaitoh Exp $");
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
@@ -99,7 +99,7 @@ allowed_user(struct passwd * pw)
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);
