[dovecot-cvs] dovecot/src/auth auth.c, 1.20, 1.21 mech-anonymous.c, 1.14, 1.15 mech-apop.c, 1.18, 1.19 mech-cram-md5.c, 1.21, 1.22 mech-digest-md5.c, 1.35, 1.36 mech-gssapi.c, 1.2, 1.3 mech-login.c, 1.14, 1.15 mech-ntlm.c, 1.21, 1.22 mech-plain.c, 1.33, 1.34 mech-rpa.c, 1.21, 1.22 mech.h, 1.36, 1.37

cras at dovecot.org cras at dovecot.org
Wed Dec 28 19:15:47 EET 2005


Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv14437

Modified Files:
	auth.c mech-anonymous.c mech-apop.c mech-cram-md5.c 
	mech-digest-md5.c mech-gssapi.c mech-login.c mech-ntlm.c 
	mech-plain.c mech-rpa.c mech.h 
Log Message:
Removed need_passdb from mechanism definitions. passdb_need_plain/credentials is enough to know that. Also give a better error message if no passdbs are set and a mechanism requires passdb.



Index: auth.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- auth.c	27 Oct 2005 14:57:50 -0000	1.20
+++ auth.c	28 Dec 2005 17:15:43 -0000	1.21
@@ -128,8 +128,6 @@
 	struct mech_module_list *list;
 
 	for (list = auth->mech_modules; list != NULL; list = list->next) {
-		if (list->module.need_passdb && auth->passdbs == NULL)
-			break;
 		if (list->module.passdb_need_plain &&
 		    !auth_passdb_list_have_plain(auth))
 			break;
@@ -139,6 +137,11 @@
 	}
 
 	if (list != NULL) {
+		if (auth->passdbs == NULL) {
+			i_fatal("No passdbs specified in configuration file. "
+				"%s mechanism needs one",
+				list->module.mech_name);
+		}
 		i_fatal("%s mechanism can't be supported with given passdbs",
 			list->module.mech_name);
 	}

Index: mech-anonymous.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-anonymous.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mech-anonymous.c	27 Oct 2005 14:57:50 -0000	1.14
+++ mech-anonymous.c	28 Dec 2005 17:15:43 -0000	1.15
@@ -57,7 +57,6 @@
 
 	MEMBER(flags) MECH_SEC_ANONYMOUS,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) FALSE,
 	MEMBER(passdb_need_credentials) FALSE,
 

Index: mech-apop.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-apop.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mech-apop.c	28 Oct 2005 12:03:07 -0000	1.18
+++ mech-apop.c	28 Dec 2005 17:15:43 -0000	1.19
@@ -162,7 +162,6 @@
 
 	MEMBER(flags) MECH_SEC_PRIVATE | MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) FALSE,
 	MEMBER(passdb_need_credentials) TRUE,
 

Index: mech-cram-md5.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-cram-md5.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mech-cram-md5.c	27 Oct 2005 14:57:50 -0000	1.21
+++ mech-cram-md5.c	28 Dec 2005 17:15:43 -0000	1.22
@@ -191,7 +191,6 @@
 
 	MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) FALSE,
 	MEMBER(passdb_need_credentials) TRUE,
 

Index: mech-digest-md5.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-digest-md5.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- mech-digest-md5.c	27 Oct 2005 14:57:51 -0000	1.35
+++ mech-digest-md5.c	28 Dec 2005 17:15:43 -0000	1.36
@@ -619,7 +619,6 @@
 	MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE |
 		MECH_SEC_MUTUAL_AUTH,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) FALSE,
 	MEMBER(passdb_need_credentials) TRUE,
 

Index: mech-gssapi.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-gssapi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mech-gssapi.c	28 Oct 2005 12:03:07 -0000	1.2
+++ mech-gssapi.c	28 Dec 2005 17:15:43 -0000	1.3
@@ -394,7 +394,6 @@
 
 	MEMBER(flags) 0,
 
-	MEMBER(need_passdb) FALSE,
 	MEMBER(passdb_need_plain) FALSE, 
 	MEMBER(passdb_need_credentials) FALSE, 
 

Index: mech-login.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-login.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mech-login.c	28 Oct 2005 12:03:07 -0000	1.14
+++ mech-login.c	28 Dec 2005 17:15:43 -0000	1.15
@@ -87,7 +87,6 @@
 
 	MEMBER(flags) MECH_SEC_PLAINTEXT,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) TRUE,
 	MEMBER(passdb_need_credentials) FALSE,
 

Index: mech-ntlm.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-ntlm.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mech-ntlm.c	28 Oct 2005 12:03:07 -0000	1.21
+++ mech-ntlm.c	28 Dec 2005 17:15:43 -0000	1.22
@@ -281,7 +281,6 @@
 
 	MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) FALSE,
 	MEMBER(passdb_need_credentials) TRUE,
 

Index: mech-plain.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-plain.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- mech-plain.c	28 Oct 2005 12:03:07 -0000	1.33
+++ mech-plain.c	28 Dec 2005 17:15:43 -0000	1.34
@@ -103,7 +103,6 @@
 
 	MEMBER(flags) MECH_SEC_PLAINTEXT,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) TRUE,
 	MEMBER(passdb_need_credentials) FALSE,
 

Index: mech-rpa.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech-rpa.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mech-rpa.c	28 Oct 2005 12:03:07 -0000	1.21
+++ mech-rpa.c	28 Dec 2005 17:15:43 -0000	1.22
@@ -614,7 +614,6 @@
 	MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE |
 		MECH_SEC_MUTUAL_AUTH,
 
-	MEMBER(need_passdb) TRUE,
 	MEMBER(passdb_need_plain) FALSE,
 	MEMBER(passdb_need_credentials) TRUE,
 

Index: mech.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mech.h	27 Oct 2005 14:57:51 -0000	1.36
+++ mech.h	28 Dec 2005 17:15:43 -0000	1.37
@@ -24,7 +24,6 @@
 	const char *mech_name;
 
         enum mech_security_flags flags;
-	unsigned int need_passdb:1;
 	unsigned int passdb_need_plain:1;
 	unsigned int passdb_need_credentials:1;
 



More information about the dovecot-cvs mailing list