[dovecot-cvs] dovecot/src/dict main.c,1.8.2.3,1.8.2.4

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/dict
In directory talvi:/tmp/cvs-serv15806/dict

Modified Files:
      Tag: branch_1_0
	main.c 
Log Message:
Don't compare to PACKAGE_VERSION in lib/ core directly, rather make
module_dir_load() have the version string as parameter. Plugin version
checks can be skipped with version_ignore=yes.



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/dict/main.c,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- main.c	16 Feb 2007 13:12:02 -0000	1.8.2.3
+++ main.c	22 Feb 2007 14:35:58 -0000	1.8.2.4
@@ -56,14 +56,14 @@
 
 static void main_init(void)
 {
-	const char *value, *path;
+	const char *version, *path;
 	int fd;
 
-	value = getenv("DOVECOT_VERSION");
-	if (value != NULL && strcmp(value, PACKAGE_VERSION) != 0) {
+	version = getenv("DOVECOT_VERSION");
+	if (version != NULL && strcmp(version, PACKAGE_VERSION) != 0) {
 		i_fatal("Dovecot version mismatch: "
 			"Master is v%s, dict is v"PACKAGE_VERSION" "
-			"(if you don't care, set version_ignore=yes)", value);
+			"(if you don't care, set version_ignore=yes)", version);
 	}
 
 	lib_signals_init();
@@ -79,7 +79,7 @@
 	dict_sql_register();
 
 	modules = getenv("MODULE_DIR") == NULL ? NULL :
-		module_dir_load(getenv("MODULE_DIR"), NULL, TRUE);
+		module_dir_load(getenv("MODULE_DIR"), NULL, TRUE, version);
 	module_dir_init(modules);
 
 	path = getenv("DICT_LISTEN_FROM_FD");