Fail if trying to give unknown parameters to passdb/userdb.

Also changed error messages to be consistent.

--HG--
branch : HEAD

diff --git a/src/auth/passdb-bsdauth.c b/src/auth/passdb-bsdauth.c
index 12b850fa5fa5ccf21e318248df897d0271534b26..38ceea5f141b9cb21742e379224a14eae8ac9f89 100644 (file)
--- a/src/auth/passdb-bsdauth.c
+++ b/src/auth/passdb-bsdauth.c
@@ -58,7 +58,8 @@ bsdauth_preinit(struct auth_passdb *auth_passdb, const char *args)
                module->cache_key =
                        auth_cache_parse_key(auth_passdb->auth->pool,
                                             args + 10);
-       }
+       } else
+               i_fatal("passdb bsdauth: Unknown setting: %s", args);
        return module;
 }
 

diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c
index 6687a5196dfe382f739f6d475e12c5fa565292f7..39787c248d227db582b350a688eda1179c7c3bcb 100644 (file)
--- a/src/auth/passdb-pam.c
+++ b/src/auth/passdb-pam.c
@@ -357,7 +357,7 @@ pam_preinit(struct auth_passdb *auth_passdb, const char *args)
                        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;

diff --git a/src/auth/passdb-passwd-file.c b/src/auth/passdb-passwd-file.c
index 935c2e02b4e9ec3cc2e06de023d23f58787c9187..4d591e429526573c2f5888b11b3431cd690f627c 100644 (file)
--- a/src/auth/passdb-passwd-file.c
+++ b/src/auth/passdb-passwd-file.c
@@ -139,6 +139,8 @@ passwd_file_preinit(struct auth_passdb *auth_passdb, const char *args)
                        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,

diff --git a/src/auth/passdb-passwd.c b/src/auth/passdb-passwd.c
index fa50ea28a2c33a41c087fbbfe91ec5a4178de1f1..161dd0f159b5ad0f3da14d5eb9af6b7ac6cf759b 100644 (file)
--- a/src/auth/passdb-passwd.c
+++ b/src/auth/passdb-passwd.c
@@ -61,6 +61,8 @@ static void passwd_init(struct passdb_module *module, const char *args)
 {
        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;

diff --git a/src/auth/passdb-shadow.c b/src/auth/passdb-shadow.c
index 04a95fd0cba1308613db111183405bc217c229b6..eff32b6e9efdc2273b253745c3c248af7bd16d85 100644 (file)
--- a/src/auth/passdb-shadow.c
+++ b/src/auth/passdb-shadow.c
@@ -61,6 +61,8 @@ static void shadow_init(struct passdb_module *module, const char *args)
 {
        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;

diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
index d3bbd1b97bbbb1d2aeb609efaa8c47e63920dae7..d8e9b265eca0844f6f17119d66e3b904ea9fa4c6 100644 (file)
--- a/src/auth/passdb-vpopmail.c
+++ b/src/auth/passdb-vpopmail.c
@@ -178,7 +178,7 @@ vpopmail_preinit(struct auth_passdb *auth_passdb, const char *args)
                        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;

diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index 0e7d8f3b9b0339b3510dc8759bcf6023aad5dd76..edf9de062406cde67a35afdbee0c105f7c6549f1 100644 (file)
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -152,6 +152,12 @@ struct auth_passdb *passdb_preinit(struct auth *auth, const char *driver,
                        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);

diff --git a/src/auth/userdb-nss.c b/src/auth/userdb-nss.c
index fae6cab441a00078a56ccdbebd44751aea06d47d..114406385389f9f3ceb648ad419279d29fe3a176 100644 (file)
--- a/src/auth/userdb-nss.c
+++ b/src/auth/userdb-nss.c
@@ -116,7 +116,7 @@ userdb_nss_preinit(struct auth_userdb *auth_userdb, const char *args)
                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)

diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c
index feabc1846949a2bcc136ecd4fde2fd9004836b76..282ee1cb4ce2f66edbb418b4fac7f7bc79fb0083 100644 (file)
--- a/src/auth/userdb-vpopmail.c
+++ b/src/auth/userdb-vpopmail.c
@@ -158,7 +158,7 @@ vpopmail_preinit(struct auth_userdb *auth_userdb, const char *args)
                                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;
 }

diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index fda8cd24239474be79015035d36c81ac3a12b68e..382a10a91a6d377af656bd9967d46f986b43f50c 100644 (file)
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -123,6 +123,12 @@ void userdb_preinit(struct auth *auth, const char *driver, const char *args)
                        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);