summaryrefslogtreecommitdiff
path: root/auth.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-30 22:13:03 +0000
committerColin Watson <cjwatson@debian.org>2005-05-30 22:13:03 +0000
commit4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch)
treebfbc91107d6bfe7b2a68d8701562e59856116a6a /auth.c
parent4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff)
parenta55bd782aa819b7f5ae716de000f19f4f531850e (diff)
Merge 4.1p1 to the trunk.
Diffstat (limited to 'auth.c')
-rw-r--r--auth.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth.c b/auth.c
index 256807683..46b013137 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth.c,v 1.57 2005/01/22 08:17:59 dtucker Exp $"); 26RCSID("$OpenBSD: auth.c,v 1.58 2005/03/14 11:44:42 dtucker Exp $");
27 27
28#ifdef HAVE_LOGIN_H 28#ifdef HAVE_LOGIN_H
29#include <login.h> 29#include <login.h>
@@ -145,7 +145,8 @@ allowed_user(struct passwd * pw)
145 return 0; 145 return 0;
146 } 146 }
147 147
148 if (options.num_deny_users > 0 || options.num_allow_users > 0) { 148 if (options.num_deny_users > 0 || options.num_allow_users > 0 ||
149 options.num_deny_groups > 0 || options.num_allow_groups > 0) {
149 hostname = get_canonical_hostname(options.use_dns); 150 hostname = get_canonical_hostname(options.use_dns);
150 ipaddr = get_remote_ipaddr(); 151 ipaddr = get_remote_ipaddr();
151 } 152 }