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 b994a103634225f727b7eca386153f2609847024..97400c08ca0a9224b2db817f2576e3a01dda94d2 100644 (file)
--- 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 d1b5005a70d99f66ecb8945270fdf3c9a4cd60b7..d2b45790799a3119adae0bc954ed44342ac76a8a 100644 (file)
--- 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