auth: passdb bsdauth, passwd and shadow are now blocking by default.

--HG--
branch : HEAD

diff --git a/doc/example-config/conf.d/auth-system.conf.ext b/doc/example-config/conf.d/auth-system.conf.ext
index 2a23cef47dbc0c7ce556edfcb9d19f7f015d6dbd..56f4659edf8fa4b2a7565c2c5b54277d650c63c3 100644 (file)
--- a/doc/example-config/conf.d/auth-system.conf.ext
+++ b/doc/example-config/conf.d/auth-system.conf.ext
@@ -19,7 +19,7 @@ passdb {
 # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
 #passdb {
   #driver = passwd
-  # [blocking=yes]
+  # [blocking=no]
   #args = 
 #}
 
@@ -28,7 +28,7 @@ passdb {
 # <doc/wiki/PasswordDatabase.Shadow.txt>
 #passdb {
   #driver = shadow
-  # [blocking=yes]
+  # [blocking=no]
   #args = 
 #}
 
@@ -36,7 +36,7 @@ passdb {
 # <doc/wiki/PasswordDatabase.BSDAuth.txt>
 #passdb {
   #driver = bsdauth
-  # [cache_key=<key>]
+  # [blocking=no] [cache_key=<key>]
   #args =
 #}
 

diff --git a/src/auth/passdb-bsdauth.c b/src/auth/passdb-bsdauth.c
index 6c5b880f5d55ea78687cf168ed7e755a521ceb8d..20aa6efa9ccb90eb3ec78f71de80c0abef8893f0 100644 (file)
--- a/src/auth/passdb-bsdauth.c
+++ b/src/auth/passdb-bsdauth.c
@@ -55,8 +55,11 @@ bsdauth_preinit(pool_t pool, const char *args)
 
        module = p_new(pool, struct passdb_module, 1);
        module->default_pass_scheme = "PLAIN"; /* same reason as PAM */
+       module->blocking = TRUE;
 
-       if (strncmp(args, "cache_key=", 10) == 0)
+       if (strcmp(module->args, "blocking=no") == 0)
+               module->blocking = FALSE;
+       else if (strncmp(args, "cache_key=", 10) == 0)
                module->cache_key = auth_cache_parse_key(pool, args + 10);
        else if (*args != '\0')
                i_fatal("passdb bsdauth: Unknown setting: %s", args);

diff --git a/src/auth/passdb-passwd.c b/src/auth/passdb-passwd.c
index 3fdb3acffb2b8bfc73d0ed3e265e3344756f1969..d3203fcd4d226798568c421296eeff666f900ee4 100644 (file)
--- a/src/auth/passdb-passwd.c
+++ b/src/auth/passdb-passwd.c
@@ -59,8 +59,9 @@ passwd_verify_plain(struct auth_request *request, const char *password,
 
 static void passwd_init(struct passdb_module *module)
 {
-       if (strcmp(module->args, "blocking=yes") == 0)
-               module->blocking = TRUE;
+       module->blocking = TRUE;
+       if (strcmp(module->args, "blocking=no") == 0)
+               module->blocking = FALSE;
        else if (*module->args != '\0')
                i_fatal("passdb passwd: Unknown setting: %s", module->args);
 

diff --git a/src/auth/passdb-shadow.c b/src/auth/passdb-shadow.c
index 8d46ab33930a24c5c14fa159c2dcd7f2c31b3fe7..15ca0d129d0f138fa97771cfa9d82663cbd877d4 100644 (file)
--- a/src/auth/passdb-shadow.c
+++ b/src/auth/passdb-shadow.c
@@ -59,8 +59,9 @@ shadow_verify_plain(struct auth_request *request, const char *password,
 
 static void shadow_init(struct passdb_module *module)
 {
-       if (strcmp(module->args, "blocking=yes") == 0)
-               module->blocking = TRUE;
+       module->blocking = TRUE;
+       if (strcmp(module->args, "blocking=no") == 0)
+               module->blocking = FALSE;
        else if (*module->args != '\0')
                i_fatal("passdb shadow: Unknown setting: %s", module->args);