[dovecot-cvs] dovecot/src/pop3 main.c,1.48.2.1,1.48.2.2

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv17051/pop3

Modified Files:
      Tag: branch_1_0
	main.c 
Log Message:
Require that master's version number matches the child's, unless
version_ignore=yes. Usually it's an accidental installation problem if the
version numbers don't match.



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/main.c,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -d -r1.48.2.1 -r1.48.2.2
--- main.c	27 Jun 2006 21:03:52 -0000	1.48.2.1
+++ main.c	10 Aug 2006 18:46:25 -0000	1.48.2.2
@@ -160,7 +160,14 @@
         enum mail_storage_flags flags;
         enum mail_storage_lock_method lock_method;
 	struct mail_storage *storage;
-	const char *mail;
+	const char *mail, *value;
+
+	value = getenv("DOVECOT_VERSION");
+	if (value != NULL && strcmp(value, PACKAGE_VERSION) != 0) {
+		i_fatal("Dovecot version mismatch: "
+			"Master is v%s, pop3 is v"PACKAGE_VERSION" "
+			"(if you don't care, set version_ignore=yes)", value);
+	}
 
 	lib_signals_init();
         lib_signals_set_handler(SIGINT, TRUE, sig_die, NULL);