summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b3a4001e..eceda670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
- dtucker@cvs.openbsd.org 2005/03/14 10:09:03
[ssh-keygen.1]
Correct description of -H (bz #997); ok markus@, punctuation jmc@
+ - dtucker@cvs.openbsd.org 2005/03/14 11:44:42
+ [auth.c]
+ Populate host for log message for logins denied by AllowUsers and
+ DenyUsers (bz #999); ok markus@
20050313
- (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the
@@ -2355,4 +2359,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3716 2005/03/14 12:15:58 dtucker Exp $
+$Id: ChangeLog,v 1.3717 2005/03/14 12:17:27 dtucker Exp $
diff --git a/auth.c b/auth.c
index 25680768..46b01313 100644
--- 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();
}