dovecot-2.0: auth: passdb bsdauth, passwd and shadow are now blo...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/5a20039e8a54
changeset: 10911:5a20039e8a54
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 14 15:30:26 2010 +0200
description:
auth: passdb bsdauth, passwd and shadow are now blocking by default.

diffstat:

 doc/example-config/conf.d/auth-system.conf.ext |  6 +++---
 src/auth/passdb-bsdauth.c                      |  5 ++++-
 src/auth/passdb-passwd.c                       |  5 +++--
 src/auth/passdb-shadow.c                       |  5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 858ad8aa7f8b -r 5a20039e8a54 doc/example-config/conf.d/auth-system.conf.ext
--- a/doc/example-config/conf.d/auth-system.conf.ext	Sun Mar 14 15:28:31 2010 +0200
+++ b/doc/example-config/conf.d/auth-system.conf.ext	Sun Mar 14 15:30:26 2010 +0200
@@ -19,7 +19,7 @@
 # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
 #passdb {
   #driver = passwd
-  # [blocking=yes]
+  # [blocking=no]
   #args = 
 #}
 
@@ -28,7 +28,7 @@
 # <doc/wiki/PasswordDatabase.Shadow.txt>
 #passdb {
   #driver = shadow
-  # [blocking=yes]
+  # [blocking=no]
   #args = 
 #}
 
@@ -36,7 +36,7 @@
 # <doc/wiki/PasswordDatabase.BSDAuth.txt>
 #passdb {
   #driver = bsdauth
-  # [cache_key=<key>]
+  # [blocking=no] [cache_key=<key>]
   #args =
 #}
 
diff -r 858ad8aa7f8b -r 5a20039e8a54 src/auth/passdb-bsdauth.c
--- a/src/auth/passdb-bsdauth.c	Sun Mar 14 15:28:31 2010 +0200
+++ b/src/auth/passdb-bsdauth.c	Sun Mar 14 15:30:26 2010 +0200
@@ -55,8 +55,11 @@
 
 	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 -r 858ad8aa7f8b -r 5a20039e8a54 src/auth/passdb-passwd.c
--- a/src/auth/passdb-passwd.c	Sun Mar 14 15:28:31 2010 +0200
+++ b/src/auth/passdb-passwd.c	Sun Mar 14 15:30:26 2010 +0200
@@ -59,8 +59,9 @@
 
 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 -r 858ad8aa7f8b -r 5a20039e8a54 src/auth/passdb-shadow.c
--- a/src/auth/passdb-shadow.c	Sun Mar 14 15:28:31 2010 +0200
+++ b/src/auth/passdb-shadow.c	Sun Mar 14 15:30:26 2010 +0200
@@ -59,8 +59,9 @@
 
 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);