From 44aef64971a92c0d77c367ba8e1f07809f9cd3b5 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 11 Feb 2011 23:44:39 +0200 Subject: [PATCH] auth: If username contains invalid chars, log sanitized username even without auth_debug. --- src/auth/auth-request.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c index f8bcfe513c..67907f169d 100644 --- a/src/auth/auth-request.c +++ b/src/auth/auth-request.c @@ -894,7 +894,8 @@ auth_request_fix_username(struct auth_request *request, const char *username, if (set->username_chars_map[*p & 0xff] == 0) { *error_r = t_strdup_printf( "Username contains disallowed character: " - "0x%02x", *p); + "0x%02x (username: %s)", *p, + str_sanitize(username, 128)); return NULL; } } @@ -963,11 +964,8 @@ bool auth_request_set_username(struct auth_request *request, } request->user = auth_request_fix_username(request, username, error_r); - if (request->user == NULL) { - auth_request_log_debug(request, "auth", - "Invalid username: %s", str_sanitize(username, 128)); + if (request->user == NULL) return FALSE; - } if (request->translated_username == NULL) { /* similar to original_username, but after translations */ request->translated_username = request->user; -- 2.47.3