anvil, config: Use the name in initial VERSION handshake.

--HG--
branch : HEAD

diff --git a/src/anvil/anvil-connection.c b/src/anvil/anvil-connection.c
index 269970bd4bee8bcad23aace14ecd0b7d1f767dfa..7868e9e3f4be66a1537231aee084eb13c5d31959 100644 (file)
--- a/src/anvil/anvil-connection.c
+++ b/src/anvil/anvil-connection.c
@@ -149,9 +149,10 @@ static void anvil_connection_input(void *context)
                if ((args = anvil_connection_next_line(conn)) == NULL)
                        return;
 
-               if (str_array_length(args) < 3 ||
+               if (str_array_length(args) < 4 ||
                    strcmp(args[0], "VERSION") != 0 ||
-                   atoi(args[1]) != ANVIL_CLIENT_PROTOCOL_MAJOR_VERSION) {
+                   strcmp(args[1], "anvil") != 0 ||
+                   atoi(args[2]) != ANVIL_CLIENT_PROTOCOL_MAJOR_VERSION) {
                        i_error("Anvil client not compatible with this server "
                                "(mixed old and new binaries?)");
                        anvil_connection_destroy(conn);

diff --git a/src/config/config-connection.c b/src/config/config-connection.c
index 44e9add7b7206936929d49ce4bbc7af66807d7ee..08f0db21922faf186ca45ee9e464b7d75efdcd9d 100644 (file)
--- a/src/config/config-connection.c
+++ b/src/config/config-connection.c
@@ -132,8 +132,8 @@ static void config_connection_input(void *context)
                if (line == NULL)
                        return;
 
-               if (strncmp(line, "VERSION\t", 8) != 0 ||
-                   atoi(t_strcut(line + 8, '\t')) !=
+               if (strncmp(line, "VERSION\tconfig\t", 15) != 0 ||
+                   atoi(t_strcut(line + 15, '\t')) !=
                    CONFIG_CLIENT_PROTOCOL_MAJOR_VERSION) {
                        i_error("Config client not compatible with this server "
                                "(mixed old and new binaries?)");

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 388a2f643a3712cf09b0fd8035df6630adae2163..fa2bf65ec1e20889458f64681fcc07b5c1c08ffc 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -16,7 +16,7 @@
 
 #define DOVECOT_CONFIG_BIN_PATH BINDIR"/doveconf"
 
-#define CONFIG_HANDSHAKE "VERSION\t1\t0\n"
+#define CONFIG_HANDSHAKE "VERSION\tconfig\t1\t0\n"
 
 #undef DEF
 #define DEF(type, name) \

diff --git a/src/login-common/main.c b/src/login-common/main.c
index 9137f484fb78024e139392c5546a6f72d8056f25..a0b65bf6c85da7de2c83d45aaeb044a81261e6ae 100644 (file)
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -75,7 +75,7 @@ static void auth_connect_notify(struct auth_client *client ATTR_UNUSED,
 
 static int anvil_connect(void)
 {
-#define ANVIL_HANDSHAKE "VERSION\t1\t0\n"
+#define ANVIL_HANDSHAKE "VERSION\tanvil\t1\t0\n"
        int fd;
 
        fd = net_connect_unix("anvil");

diff --git a/src/master/service-anvil.c b/src/master/service-anvil.c
index 3d624da7a98dd05a0dc0185577b5cb23d8f802cf..25c9cdf61fe98a7531ec04e90132c86c07f28e77 100644 (file)
--- a/src/master/service-anvil.c
+++ b/src/master/service-anvil.c
@@ -10,7 +10,7 @@
 
 #include <unistd.h>
 
-#define ANVIL_HANDSHAKE "VERSION\t1\t0\n"
+#define ANVIL_HANDSHAKE "VERSION\tanvil\t1\t0\n"
 
 static int anvil_send_handshake(int fd, const char **error_r)
 {