- (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h.

[openssh.git] / auth.c

diff --git a/auth.c b/auth.c
index e6dcab209abad3b05e3f8aeccdb6da1a9656f617..46b0131375ad6a1dd36228e4c90c28f13660e457 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.57 2005/01/22 08:17:59 dtucker Exp $");
+RCSID("$OpenBSD: auth.c,v 1.58 2005/03/14 11:44:42 dtucker Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -145,7 +145,8 @@ allowed_user(struct passwd * pw)
                return 0;
        }
 
-       if (options.num_deny_users > 0 || options.num_allow_users > 0) {
+       if (options.num_deny_users > 0 || options.num_allow_users > 0 ||
+           options.num_deny_groups > 0 || options.num_allow_groups > 0) {
                hostname = get_canonical_hostname(options.use_dns);
                ipaddr = get_remote_ipaddr();
        }
@@ -209,7 +210,7 @@ allowed_user(struct passwd * pw)
        }
 
 #ifdef CUSTOM_SYS_AUTH_ALLOWED_USER
-       if (!sys_auth_allowed_user(pw))
+       if (!sys_auth_allowed_user(pw, &loginmsg))
                return 0;
 #endif