dovecot-2.0: anvil, config: Use the name in initial VERSION hand...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Sep 4 20:48:06 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/1d2d0aa8e313
changeset: 9866:1d2d0aa8e313
user: Timo Sirainen <tss at iki.fi>
date: Fri Sep 04 13:47:57 2009 -0400
description:
anvil, config: Use the name in initial VERSION handshake.
diffstat:
5 files changed, 8 insertions(+), 7 deletions(-)
src/anvil/anvil-connection.c | 5 +++--
src/config/config-connection.c | 4 ++--
src/lib-master/master-service-settings.c | 2 +-
src/login-common/main.c | 2 +-
src/master/service-anvil.c | 2 +-
diffs (66 lines):
diff -r c90ba3f3fa51 -r 1d2d0aa8e313 src/anvil/anvil-connection.c
--- a/src/anvil/anvil-connection.c Fri Sep 04 13:47:16 2009 -0400
+++ b/src/anvil/anvil-connection.c Fri Sep 04 13:47:57 2009 -0400
@@ -149,9 +149,10 @@ static void anvil_connection_input(void
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 -r c90ba3f3fa51 -r 1d2d0aa8e313 src/config/config-connection.c
--- a/src/config/config-connection.c Fri Sep 04 13:47:16 2009 -0400
+++ b/src/config/config-connection.c Fri Sep 04 13:47:57 2009 -0400
@@ -132,8 +132,8 @@ static void config_connection_input(void
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 -r c90ba3f3fa51 -r 1d2d0aa8e313 src/lib-master/master-service-settings.c
--- a/src/lib-master/master-service-settings.c Fri Sep 04 13:47:16 2009 -0400
+++ b/src/lib-master/master-service-settings.c Fri Sep 04 13:47:57 2009 -0400
@@ -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 -r c90ba3f3fa51 -r 1d2d0aa8e313 src/login-common/main.c
--- a/src/login-common/main.c Fri Sep 04 13:47:16 2009 -0400
+++ b/src/login-common/main.c Fri Sep 04 13:47:57 2009 -0400
@@ -75,7 +75,7 @@ static void auth_connect_notify(struct a
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 -r c90ba3f3fa51 -r 1d2d0aa8e313 src/master/service-anvil.c
--- a/src/master/service-anvil.c Fri Sep 04 13:47:16 2009 -0400
+++ b/src/master/service-anvil.c Fri Sep 04 13:47:57 2009 -0400
@@ -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)
{
More information about the dovecot-cvs
mailing list