[dovecot-cvs] dovecot/src/master auth-process.c, 1.91, 1.92 master-settings.c, 1.114, 1.115 master-settings.h, 1.75, 1.76

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv7832/src/master

Modified Files:
	auth-process.c master-settings.c master-settings.h 
Log Message:
Removed master_no_passdb setting. Added pass setting which can be used to do
the same thing, and other things. Now setting pass=yes to a passdb continues
to next passdb if the lookup succeeded. This allows eg. requiring the user
to be in multiple passdbs, or doing a username conversion before running the
actual userdb, etc.



Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- auth-process.c	26 Feb 2006 10:05:27 -0000	1.91
+++ auth-process.c	25 Mar 2006 10:22:04 -0000	1.92
@@ -431,12 +431,10 @@
 		}
 		if (ap->deny)
 			env_put(t_strdup_printf("PASSDB_%u_DENY=1", i));
+                if (ap->pass)
+                        env_put(t_strdup_printf("PASSDB_%u_PASS=1", i));
 		if (ap->master)
                         env_put(t_strdup_printf("PASSDB_%u_MASTER=1", i));
-                if (ap->master_no_passdb) {
-                        env_put(t_strdup_printf("PASSDB_%u_MASTER_NO_PASSDB=1",
-                                                i));
-                }
 	}
 	for (au = set->userdbs, i = 1; au != NULL; au = au->next, i++) {
 		env_put(t_strdup_printf("USERDB_%u_DRIVER=%s", i, au->driver));

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- master-settings.c	26 Feb 2006 12:16:08 -0000	1.114
+++ master-settings.c	25 Mar 2006 10:22:04 -0000	1.115
@@ -214,8 +214,8 @@
 	DEF(SET_STR, driver),
 	DEF(SET_STR, args),
 	DEF(SET_BOOL, deny),
+	DEF(SET_BOOL, pass),
 	DEF(SET_BOOL, master),
-	DEF(SET_BOOL, master_no_passdb),
 
 	{ 0, NULL, 0 }
 };

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- master-settings.h	26 Feb 2006 12:16:08 -0000	1.75
+++ master-settings.h	25 Mar 2006 10:22:04 -0000	1.76
@@ -145,8 +145,8 @@
 	const char *driver;
 	const char *args;
 	bool deny;
+	bool pass;
 	bool master;
-	bool master_no_passdb;
 };
 
 struct auth_userdb_settings {