From: Timo Sirainen <tss@iki.fi>
Date: Mon, 22 Oct 2012 15:59:20 +0000 (+0300)
Subject: auth: Log a nicer message if client timeouts authentication in the middle.
X-Git-Tag: 2.2.alpha1~20^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec7a751d45871fb36b19121fd4d7bd33145bf222;p=thirdparty%2Fdovecot%2Fcore.git

auth: Log a nicer message if client timeouts authentication in the middle.
---

diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index c4ccf00bc6..b3a8c19757 100644
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -401,19 +401,18 @@ static void auth_request_handler_auth_fail(struct auth_request_handler *handler,
 
 static void auth_request_timeout(struct auth_request *request)
 {
-	const char *str;
+	unsigned int secs = (unsigned int)(time(NULL) - request->last_access);
 
-	str = t_strdup_printf("Request %u.%u timeouted after %u secs, state=%d",
-			      request->handler->client_pid, request->id,
-			      (unsigned int)(time(NULL) - request->last_access),
-			      request->state);
 	if (request->state != AUTH_REQUEST_STATE_MECH_CONTINUE) {
 		/* client's fault */
 		auth_request_log_error(request, request->mech->mech_name,
-				       "%s", str);
+			"Request %u.%u timed out after %u secs, state=%d",
+			request->handler->client_pid, request->id,
+			secs, request->state);
 	} else if (request->set->verbose) {
 		auth_request_log_info(request, request->mech->mech_name,
-				      "%s", str);
+			"Request timed out waiting for client to continue authentication "
+			"(%u secs)", secs);
 	}
 	auth_request_handler_remove(request->handler, request);
 }