dovecot-2.2: auth: Use a common auth_request_log_unknown_user() ...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 22 02:32:17 EEST 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/4ce8f47d20af
changeset: 16807:4ce8f47d20af
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 22 02:32:05 2013 +0300
description:
auth: Use a common auth_request_log_unknown_user() for logging "unknown user" entries.
diffstat:
src/auth/auth-request.c | 6 ++++++
src/auth/auth-request.h | 2 ++
src/auth/db-passwd-file.c | 2 +-
src/auth/passdb-bsdauth.c | 2 +-
src/auth/passdb-cache.c | 2 +-
src/auth/passdb-dict.c | 2 +-
src/auth/passdb-ldap.c | 9 +++------
src/auth/passdb-pam.c | 5 ++++-
src/auth/passdb-passwd.c | 2 +-
src/auth/passdb-shadow.c | 2 +-
src/auth/passdb-sql.c | 2 +-
src/auth/userdb-dict.c | 2 +-
src/auth/userdb-ldap.c | 3 +--
src/auth/userdb-nss.c | 2 +-
src/auth/userdb-passwd.c | 2 +-
src/auth/userdb-sql.c | 2 +-
src/auth/userdb-vpopmail.c | 2 +-
17 files changed, 28 insertions(+), 21 deletions(-)
diffs (233 lines):
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/auth-request.c
--- a/src/auth/auth-request.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/auth-request.c Sun Sep 22 02:32:05 2013 +0300
@@ -2114,6 +2114,12 @@
va_end(va);
}
+void auth_request_log_unknown_user(struct auth_request *auth_request,
+ const char *subsystem)
+{
+ auth_request_log_info(auth_request, subsystem, "unknown user");
+}
+
void auth_request_refresh_last_access(struct auth_request *request)
{
request->last_access = ioloop_time;
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/auth-request.h
--- a/src/auth/auth-request.h Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/auth-request.h Sun Sep 22 02:32:05 2013 +0300
@@ -245,6 +245,8 @@
void auth_request_log_error(struct auth_request *auth_request,
const char *subsystem,
const char *format, ...) ATTR_FORMAT(3, 4);
+void auth_request_log_unknown_user(struct auth_request *auth_request,
+ const char *subsystem);
void auth_request_verify_plain_callback(enum passdb_result result,
struct auth_request *request);
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/db-passwd-file.c
--- a/src/auth/db-passwd-file.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/db-passwd-file.c Sun Sep 22 02:32:05 2013 +0300
@@ -463,7 +463,7 @@
pu = hash_table_lookup(pw->users, str_c(username));
if (pu == NULL)
- auth_request_log_info(request, "passwd-file", "unknown user");
+ auth_request_log_unknown_user(request, "passwd-file");
return pu;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-bsdauth.c
--- a/src/auth/passdb-bsdauth.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-bsdauth.c Sun Sep 22 02:32:05 2013 +0300
@@ -30,7 +30,7 @@
callback(PASSDB_RESULT_INTERNAL_FAILURE, request);
return;
case 0:
- auth_request_log_info(request, "bsdauth", "unknown user");
+ auth_request_log_unknown_user(request, "bsdauth");
callback(PASSDB_RESULT_USER_UNKNOWN, request);
return;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-cache.c
--- a/src/auth/passdb-cache.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-cache.c Sun Sep 22 02:32:05 2013 +0300
@@ -48,7 +48,7 @@
if (*value == '\0') {
/* negative cache entry */
- auth_request_log_info(request, "cache", "User unknown");
+ auth_request_log_unknown_user(request, "cache");
*result_r = PASSDB_RESULT_USER_UNKNOWN;
return TRUE;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-dict.c
--- a/src/auth/passdb-dict.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-dict.c Sun Sep 22 02:32:05 2013 +0300
@@ -64,7 +64,7 @@
auth_request_log_error(auth_request, "dict", "Lookup failed");
return PASSDB_RESULT_INTERNAL_FAILURE;
} else if (ret == 0) {
- auth_request_log_info(auth_request, "dict", "unknown user");
+ auth_request_log_unknown_user(auth_request, "dict");
return PASSDB_RESULT_USER_UNKNOWN;
} else {
auth_request_log_debug(auth_request, "dict",
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-ldap.c Sun Sep 22 02:32:05 2013 +0300
@@ -77,8 +77,7 @@
passdb_result = PASSDB_RESULT_INTERNAL_FAILURE;
} else if (ldap_request->entries == 0) {
passdb_result = PASSDB_RESULT_USER_UNKNOWN;
- auth_request_log_info(auth_request, "ldap",
- "unknown user");
+ auth_request_log_unknown_user(auth_request, "ldap");
} else if (ldap_request->entries > 1) {
auth_request_log_error(auth_request, "ldap",
"pass_filter matched multiple objects, aborting");
@@ -166,8 +165,7 @@
passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;
} else if (ret == LDAP_NO_SUCH_OBJECT) {
passdb_result = PASSDB_RESULT_USER_UNKNOWN;
- auth_request_log_info(auth_request, "ldap",
- "unknown user");
+ auth_request_log_unknown_user(auth_request, "ldap");
} else {
auth_request_log_error(auth_request, "ldap",
"ldap_bind() failed: %s",
@@ -214,8 +212,7 @@
passdb_result = PASSDB_RESULT_INTERNAL_FAILURE;
else if (request->entries == 0) {
passdb_result = PASSDB_RESULT_USER_UNKNOWN;
- auth_request_log_info(auth_request, "ldap",
- "unknown user");
+ auth_request_log_unknown_user(auth_request, "ldap");
} else {
i_assert(request->entries > 1);
auth_request_log_error(auth_request, "ldap",
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-pam.c
--- a/src/auth/passdb-pam.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-pam.c Sun Sep 22 02:32:05 2013 +0300
@@ -181,7 +181,10 @@
}
auth_request_log_info(request, "pam", "%s", str);
} else {
- auth_request_log_info(request, "pam", "%s", str);
+ if (status == PAM_USER_UNKNOWN)
+ auth_request_log_unknown_user(request, "pam");
+ else
+ auth_request_log_info(request, "pam", "%s", str);
}
return status;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-passwd.c
--- a/src/auth/passdb-passwd.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-passwd.c Sun Sep 22 02:32:05 2013 +0300
@@ -27,7 +27,7 @@
callback(PASSDB_RESULT_INTERNAL_FAILURE, request);
return;
case 0:
- auth_request_log_info(request, "passwd", "unknown user");
+ auth_request_log_unknown_user(request, "passwd");
callback(PASSDB_RESULT_USER_UNKNOWN, request);
return;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-shadow.c
--- a/src/auth/passdb-shadow.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-shadow.c Sun Sep 22 02:32:05 2013 +0300
@@ -23,7 +23,7 @@
spw = getspnam(request->user);
if (spw == NULL) {
- auth_request_log_info(request, "shadow", "unknown user");
+ auth_request_log_unknown_user(request, "shadow");
callback(PASSDB_RESULT_USER_UNKNOWN, request);
return;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/passdb-sql.c
--- a/src/auth/passdb-sql.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/passdb-sql.c Sun Sep 22 02:32:05 2013 +0300
@@ -85,7 +85,7 @@
module->conn->set.password_query);
}
} else if (ret == 0) {
- auth_request_log_info(auth_request, "sql", "unknown user");
+ auth_request_log_unknown_user(auth_request, "sql");
passdb_result = PASSDB_RESULT_USER_UNKNOWN;
} else {
sql_query_save_results(result, sql_request);
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/userdb-dict.c
--- a/src/auth/userdb-dict.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/userdb-dict.c Sun Sep 22 02:32:05 2013 +0300
@@ -81,7 +81,7 @@
auth_request_log_error(auth_request, "dict", "Lookup failed");
userdb_result = USERDB_RESULT_INTERNAL_FAILURE;
} else if (ret == 0) {
- auth_request_log_info(auth_request, "dict", "unknown user");
+ auth_request_log_unknown_user(auth_request, "dict");
userdb_result = USERDB_RESULT_USER_UNKNOWN;
} else {
auth_request_log_debug(auth_request, "dict",
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/userdb-ldap.c Sun Sep 22 02:32:05 2013 +0300
@@ -71,8 +71,7 @@
result = USERDB_RESULT_INTERNAL_FAILURE;
} else if (urequest->entries == 0) {
result = USERDB_RESULT_USER_UNKNOWN;
- auth_request_log_info(auth_request, "ldap",
- "unknown user");
+ auth_request_log_unknown_user(auth_request, "ldap");
} else if (urequest->entries > 1) {
auth_request_log_error(auth_request, "ldap",
"user_filter matched multiple objects, aborting");
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/userdb-nss.c
--- a/src/auth/userdb-nss.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/userdb-nss.c Sun Sep 22 02:32:05 2013 +0300
@@ -52,7 +52,7 @@
"unavailable (err=%d)", err);
break;
case NSS_STATUS_NOTFOUND:
- auth_request_log_info(auth_request, "nss", "unknown user");
+ auth_request_log_unknown_user(auth_request, "nss");
result = USERDB_RESULT_USER_UNKNOWN;
break;
case NSS_STATUS_SUCCESS:
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/userdb-passwd.c
--- a/src/auth/userdb-passwd.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/userdb-passwd.c Sun Sep 22 02:32:05 2013 +0300
@@ -101,7 +101,7 @@
callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
return;
case 0:
- auth_request_log_info(auth_request, "passwd", "unknown user");
+ auth_request_log_unknown_user(auth_request, "passwd");
callback(USERDB_RESULT_USER_UNKNOWN, auth_request);
return;
}
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/userdb-sql.c
--- a/src/auth/userdb-sql.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/userdb-sql.c Sun Sep 22 02:32:05 2013 +0300
@@ -83,7 +83,7 @@
}
} else if (ret == 0) {
result = USERDB_RESULT_USER_UNKNOWN;
- auth_request_log_info(auth_request, "sql", "Unknown user");
+ auth_request_log_unknown_user(auth_request, "sql");
} else {
sql_query_get_result(sql_result, auth_request);
result = USERDB_RESULT_OK;
diff -r 07cc79e0041d -r 4ce8f47d20af src/auth/userdb-vpopmail.c
--- a/src/auth/userdb-vpopmail.c Sun Sep 22 02:24:05 2013 +0300
+++ b/src/auth/userdb-vpopmail.c Sun Sep 22 02:32:05 2013 +0300
@@ -42,7 +42,7 @@
vpw = vauth_getpw(vpop_user, vpop_domain);
if (vpw == NULL) {
- auth_request_log_info(request, "vpopmail", "unknown user");
+ auth_request_log_unknown_user(request, "vpopmail");
return NULL;
}
More information about the dovecot-cvs
mailing list