From: Timo Sirainen <tss@iki.fi>
Date: Fri, 4 Sep 2009 17:47:57 +0000 (-0400)
Subject: anvil, config: Use the name in initial VERSION handshake.
X-Git-Tag: 2.0.alpha1~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6260b961ca7b469a75ab842eeb53d3f904090e3;p=thirdparty%2Fdovecot%2Fcore.git

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 269970bd4b..7868e9e3f4 100644
--- 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 44e9add7b7..08f0db2192 100644
--- 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 388a2f643a..fa2bf65ec1 100644
--- 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 9137f484fb..a0b65bf6c8 100644
--- 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 3d624da7a9..25c9cdf61f 100644
--- 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)
 {