From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 15 Jan 2020 17:06:32 +0000 (+0200)
Subject: login-common: Change struct client.created to timeval
X-Git-Tag: 2.3.15~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10746c5b8523a298f8b7166967874a78c3f53fd7;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Change struct client.created to timeval
---

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index e006b43e09..b51ed6c198 100644
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -345,7 +345,7 @@ static void proxy_input(struct client *client)
 		return;
 	case -1:
 		line = i_stream_next_line(input);
-		duration = ioloop_time - client->created;
+		duration = ioloop_time - client->created.tv_sec;
 		const char *reason = t_strdup_printf(
 			"Disconnected by server: %s "
 			"(state=%s, duration=%us)%s",
diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index 69477a96c3..5dfcbd95c4 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -106,7 +106,7 @@ static void client_idle_disconnect_timeout(struct client *client)
 			"Disconnected for inactivity during authentication.";
 		destroy_reason = "Inactivity during authentication";
 	} else if (client->login_proxy != NULL) {
-		secs = ioloop_time - client->created;
+		secs = ioloop_time - client->created.tv_sec;
 		user_reason = "Timeout while finishing login.";
 		destroy_reason = t_strdup_printf(
 			"Logging in timed out "
@@ -183,7 +183,7 @@ client_alloc(int fd, pool_t pool,
 	if (client->v.auth_parse_response == NULL)
 		client->v.auth_parse_response = client_auth_parse_response;
 
-	client->created = ioloop_time;
+	client->created = ioloop_timeval;
 	client->refcount = 1;
 
 	client->pool = pool;
@@ -995,7 +995,7 @@ const char *client_get_extra_disconnect_reason(struct client *client)
 	if (!client->notified_auth_ready)
 		return t_strdup_printf(
 			"(disconnected before auth was ready, waited %u secs)",
-			(unsigned int)(ioloop_time - client->created));
+			(unsigned int)(ioloop_time - client->created.tv_sec));
 
 	if (client->auth_attempts == 0) {
 		if (!client->banner_sent) {
@@ -1003,7 +1003,7 @@ const char *client_get_extra_disconnect_reason(struct client *client)
 			return "";
 		}
 		return t_strdup_printf("(no auth attempts in %u secs)",
-			(unsigned int)(ioloop_time - client->created));
+			(unsigned int)(ioloop_time - client->created.tv_sec));
 	}
 
 	/* some auth attempts without SSL/TLS */
diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 93f9bb7f2b..790762410d 100644
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -151,7 +151,7 @@ struct client {
 	struct client_vfuncs v;
 	struct client_vfuncs *vlast;
 
-	time_t created;
+	struct timeval created;
 	int refcount;
 	struct event *event;