[dovecot-cvs] dovecot/src/master master-settings.c,1.18,1.19
cras at procontrol.fi
cras at procontrol.fi
Tue May 20 22:49:44 EEST 2003
Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv12134
Modified Files:
master-settings.c
Log Message:
Check that imap/pop3 module directories exist if they're enabled. Give a
warning if module support is enabled in config file but not built into
binary.
Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- master-settings.c 14 May 2003 18:23:05 -0000 1.18
+++ master-settings.c 20 May 2003 18:49:41 -0000 1.19
@@ -327,6 +327,18 @@
i_fatal("Can't use imap executable %s: %m",
set->imap_executable);
}
+#ifdef HAVE_MODULES
+ if (set->imap_use_modules &&
+ access(set->imap_modules, R_OK | X_OK) < 0) {
+ i_fatal("Can't access imap module directory: %s: %m",
+ set->imap_modules);
+ }
+#else
+ if (set->imap_use_modules) {
+ i_warning("Module support wasn't built into Dovecot, "
+ "ignoring imap_use_modules setting");
+ }
+#endif
}
if (strstr(set->protocols, "pop3") != NULL) {
@@ -334,6 +346,18 @@
i_fatal("Can't use pop3 executable %s: %m",
set->pop3_executable);
}
+#ifdef HAVE_MODULES
+ if (set->pop3_use_modules &&
+ access(set->pop3_modules, R_OK | X_OK) < 0) {
+ i_fatal("Can't access pop3 module directory: %s: %m",
+ set->imap_modules);
+ }
+#else
+ if (set->pop3_use_modules) {
+ i_warning("Module support wasn't built into Dovecot, "
+ "ignoring pop3_use_modules setting");
+ }
+#endif
}
if (set->log_path != NULL && access(set->log_path, W_OK) < 0) {
More information about the dovecot-cvs
mailing list