Mercurial > dovecot > original-hg > dovecot-1.2

changeset 8513:0691f5294bb9 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fail if trying to give unknown parameters to passdb/userdb. Also changed error messages to be consistent.
author Timo Sirainen <tss@iki.fi>
date Tue, 02 Dec 2008 19:24:57 +0200
parents 2034087a9663
children 1bb73f69b3f3
files src/auth/passdb-bsdauth.c src/auth/passdb-pam.c src/auth/passdb-passwd-file.c src/auth/passdb-passwd.c src/auth/passdb-shadow.c src/auth/passdb-vpopmail.c src/auth/passdb.c src/auth/userdb-nss.c src/auth/userdb-vpopmail.c src/auth/userdb.c
diffstat 10 files changed, 24 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/passdb-bsdauth.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb-bsdauth.c	Tue Dec 02 19:24:57 2008 +0200
@@ -58,7 +58,8 @@
 		module->cache_key =
 			auth_cache_parse_key(auth_passdb->auth->pool,
 					     args + 10);
-	}
+	} else
+		i_fatal("passdb bsdauth: Unknown setting: %s", args);
 	return module;
 }
 
--- a/src/auth/passdb-pam.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb-pam.c	Tue Dec 02 19:24:57 2008 +0200
@@ -357,7 +357,7 @@
 			module->service_name =
 				p_strdup(auth_passdb->auth->pool, t_args[i]);
 		} else {
-			i_fatal("Unexpected PAM parameter: %s", t_args[i]);
+			i_fatal("passdb pam: Unknown setting: %s", t_args[i]);
 		}
 	}
 	return &module->module;
--- a/src/auth/passdb-passwd-file.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb-passwd-file.c	Tue Dec 02 19:24:57 2008 +0200
@@ -139,6 +139,8 @@
 			scheme = p_strdup(auth_passdb->auth->pool, value);
 		else if (strcmp(key, "username_format") == 0)
 			format = p_strdup(auth_passdb->auth->pool, value);
+		else
+			i_fatal("passdb passwd-file: Unknown setting: %s", key);
 	}
 
 	module = p_new(auth_passdb->auth->pool,
--- a/src/auth/passdb-passwd.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb-passwd.c	Tue Dec 02 19:24:57 2008 +0200
@@ -61,6 +61,8 @@
 {
 	if (strcmp(args, "blocking=yes") == 0)
 		module->blocking = TRUE;
+	else
+		i_fatal("passdb passwd: Unknown setting: %s", args);
 
 	module->cache_key = PASSWD_CACHE_KEY;
 	module->default_pass_scheme = PASSWD_PASS_SCHEME;
--- a/src/auth/passdb-shadow.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb-shadow.c	Tue Dec 02 19:24:57 2008 +0200
@@ -61,6 +61,8 @@
 {
 	if (strcmp(args, "blocking=yes") == 0)
 		module->blocking = TRUE;
+	else
+		i_fatal("passdb shadow: Unknown setting: %s", args);
 
 	module->cache_key = SHADOW_CACHE_KEY;
 	module->default_pass_scheme = SHADOW_PASS_SCHEME;
--- a/src/auth/passdb-vpopmail.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb-vpopmail.c	Tue Dec 02 19:24:57 2008 +0200
@@ -178,7 +178,7 @@
 			if (net_addr2ip(*tmp + 8, &module->webmail_ip) < 0)
 				i_fatal("vpopmail: Invalid webmail IP address");
 		} else {
-			i_fatal("vpopmail: Unknown setting: %s", *tmp);
+			i_fatal("passdb vpopmail: Unknown setting: %s", *tmp);
 		}
 	}
 	return &module->module;
--- a/src/auth/passdb.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/passdb.c	Tue Dec 02 19:24:57 2008 +0200
@@ -152,6 +152,12 @@
 			driver);
 	}
 
+	if (iface->preinit == NULL && iface->init == NULL &&
+	    *auth_passdb->args != '\0') {
+		i_fatal("passdb %s: No args are supported: %s",
+			driver, auth_passdb->args);
+	}
+
 	if (iface->preinit == NULL) {
 		auth_passdb->passdb =
 			p_new(auth->pool, struct passdb_module, 1);
--- a/src/auth/userdb-nss.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/userdb-nss.c	Tue Dec 02 19:24:57 2008 +0200
@@ -116,7 +116,7 @@
 		else if (strncmp(*tmp, "service=", 8) == 0)
 			module->nss_module.name = p_strdup(pool, *tmp + 8);
 		else
-			i_fatal("userdb nss: Unknown parameter: %s", *tmp);
+			i_fatal("userdb nss: Unknown setting: %s", *tmp);
 	}
 
 	if (module->nss_module.name == NULL)
--- a/src/auth/userdb-vpopmail.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/userdb-vpopmail.c	Tue Dec 02 19:24:57 2008 +0200
@@ -158,7 +158,7 @@
 				p_strdup_until(pool, *tmp + 15, p);
 			module->quota_template_value = p_strdup(pool, p + 1);
 		} else
-			i_fatal("vpopmail userdb: Unknown args: %s", *tmp);
+			i_fatal("userdb vpopmail: Unknown setting: %s", *tmp);
 	}
 	return &module->module;
 }
--- a/src/auth/userdb.c	Tue Dec 02 19:11:49 2008 +0200
+++ b/src/auth/userdb.c	Tue Dec 02 19:24:57 2008 +0200
@@ -123,6 +123,12 @@
 			driver);
 	}
 
+	if (iface->preinit == NULL && iface->init == NULL &&
+	    *auth_userdb->args != '\0') {
+		i_fatal("userdb %s: No args are supported: %s",
+			driver, auth_userdb->args);
+	}
+
 	if (iface->preinit == NULL) {
 		auth_userdb->userdb =
 			p_new(auth->pool, struct userdb_module, 1);