From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 30 Jul 2021 14:00:11 +0000 (+0300)
Subject: lib-doveadm: Rename DOVEADM_PROTOCOL_MIN_VERSION_* macros and make them public
X-Git-Tag: 2.4.0~4753
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cef89669789aaad955a230295c584ddd9986faaf;p=thirdparty%2Fdovecot%2Fcore.git

lib-doveadm: Rename DOVEADM_PROTOCOL_MIN_VERSION_* macros and make them public
---

diff --git a/src/lib-doveadm/doveadm-client.c b/src/lib-doveadm/doveadm-client.c
index b994a10363..97400c08ca 100644
--- a/src/lib-doveadm/doveadm-client.c
+++ b/src/lib-doveadm/doveadm-client.c
@@ -18,10 +18,6 @@
 
 #define MAX_INBUF_SIZE (1024*32)
 
-#define DOVEADM_PROTO_MINOR_MIN_MULTIPLEX 1
-#define DOVEADM_PROTO_MINOR_MIN_STARTTLS 2
-#define DOVEADM_PROTO_MINOR_MIN_PROXY_TTL 3
-
 enum doveadm_client_reply_state {
 	DOVEADM_CLIENT_REPLY_STATE_DONE = 0,
 	DOVEADM_CLIENT_REPLY_STATE_PRINT,
@@ -239,7 +235,7 @@ doveadm_client_send_cmd(struct doveadm_client *conn,
 	i_assert(conn->authenticated);
 	i_assert(proxy_ttl >= 1);
 
-	if (conn->conn.minor_version < DOVEADM_PROTO_MINOR_MIN_PROXY_TTL) {
+	if (conn->conn.minor_version < DOVEADM_PROTOCOL_MIN_VERSION_PROXY_TTL) {
 		o_stream_nsend_str(conn->conn.output, cmdline);
 		return;
 	}
@@ -340,7 +336,7 @@ static void doveadm_client_authenticated(struct doveadm_client *conn)
 {
 	conn->authenticated = TRUE;
 
-	if (conn->conn.minor_version >= DOVEADM_PROTO_MINOR_MIN_MULTIPLEX)
+	if (conn->conn.minor_version >= DOVEADM_PROTOCOL_MIN_VERSION_MULTIPLEX)
 		doveadm_client_start_multiplex(conn);
 
 	if (conn->delayed_cmd != NULL) {
@@ -364,7 +360,7 @@ doveadm_client_prepare_authentication(struct doveadm_client *conn,
 	if (!conn->ssl_done &&
 	    (conn->set.ssl_flags & AUTH_PROXY_SSL_FLAG_STARTTLS) != 0) {
 		connection_input_halt(&conn->conn);
-		if (conn->conn.minor_version < DOVEADM_PROTO_MINOR_MIN_STARTTLS) {
+		if (conn->conn.minor_version < DOVEADM_PROTOCOL_MIN_VERSION_STARTTLS) {
 			e_error(conn->conn.event,
 				"doveadm STARTTLS failed: Server does not support it");
 			return -1;
diff --git a/src/lib-doveadm/doveadm-protocol.h b/src/lib-doveadm/doveadm-protocol.h
index d1b5005a70..d2b4579079 100644
--- a/src/lib-doveadm/doveadm-protocol.h
+++ b/src/lib-doveadm/doveadm-protocol.h
@@ -7,6 +7,10 @@
 #define DOVEADM_CLIENT_PROTOCOL_VERSION_LINE "VERSION\tdoveadm-client\t1\t3"
 #define DOVEADM_TCP_CONNECT_TIMEOUT_SECS 30
 
+#define DOVEADM_PROTOCOL_MIN_VERSION_MULTIPLEX 1
+#define DOVEADM_PROTOCOL_MIN_VERSION_STARTTLS 2
+#define DOVEADM_PROTOCOL_MIN_VERSION_PROXY_TTL 3
+
 #define DOVEADM_EX_NOTFOUND EX_NOHOST
 #define DOVEADM_EX_NOTPOSSIBLE EX_DATAERR
 #define DOVEADM_EX_UNKNOWN -1