[dovecot-cvs] dovecot/src/master main.c, 1.80.2.10, 1.80.2.11 master-settings.c, 1.125.2.10, 1.125.2.11 master-settings.h, 1.83.2.3, 1.83.2.4

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	main.c master-settings.c master-settings.h 
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/master/main.c,v
retrieving revision 1.80.2.10
retrieving revision 1.80.2.11
diff -u -d -r1.80.2.10 -r1.80.2.11
--- main.c	6 Aug 2006 20:05:25 -0000	1.80.2.10
+++ main.c	10 Aug 2006 18:46:21 -0000	1.80.2.11
@@ -82,6 +82,8 @@
 		facility = LOG_MAIL;
 	env_put(t_strdup_printf("SYSLOG_FACILITY=%d", facility));
 
+	if (settings_root != NULL && !settings_root->defaults->version_ignore)
+		env_put("DOVECOT_VERSION="PACKAGE_VERSION);
 #ifdef DEBUG
 	if (gdb) env_put("GDB=1");
 #endif

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.10
retrieving revision 1.125.2.11
diff -u -d -r1.125.2.10 -r1.125.2.11
--- master-settings.c	6 Aug 2006 20:37:14 -0000	1.125.2.10
+++ master-settings.c	10 Aug 2006 18:46:21 -0000	1.125.2.11
@@ -77,6 +77,7 @@
 	DEF(SET_BOOL, verbose_ssl),
 	DEF(SET_BOOL, shutdown_clients),
 	DEF(SET_BOOL, nfs_check),
+	DEF(SET_BOOL, version_ignore),
 
 	/* login */
 	DEF(SET_STR, login_dir),
@@ -283,6 +284,7 @@
 	MEMBER(verbose_ssl) FALSE,
 	MEMBER(shutdown_clients) TRUE,
 	MEMBER(nfs_check) TRUE,
+	MEMBER(version_ignore) FALSE,
 
 	/* login */
 	MEMBER(login_dir) "login",

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.83.2.3
retrieving revision 1.83.2.4
diff -u -d -r1.83.2.3 -r1.83.2.4
--- master-settings.h	6 Aug 2006 20:05:25 -0000	1.83.2.3
+++ master-settings.h	10 Aug 2006 18:46:21 -0000	1.83.2.4
@@ -38,6 +38,7 @@
 	bool verbose_ssl;
 	bool shutdown_clients;
 	bool nfs_check;
+	bool version_ignore;
 
 	/* login */
 	const char *login_dir;