[dovecot-cvs] dovecot/src/auth passdb.c,1.8,1.9 userdb.c,1.5,1.6

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/auth
In directory danu:/tmp/cvs-serv21356

Modified Files:
	passdb.c userdb.c 
Log Message:
cleanups



Index: passdb.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/passdb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- passdb.c	6 Mar 2003 23:20:16 -0000	1.8
+++ passdb.c	14 Mar 2003 22:15:43 -0000	1.9
@@ -107,11 +107,11 @@
 		passdb = &passdb_ldap;
 #endif
 #ifdef PASSDB_PGSQL
-    if (strcasecmp(name, "pgsql") == 0)
-        passdb = &passdb_pgsql;
+	if (strcasecmp(name, "pgsql") == 0)
+		passdb = &passdb_pgsql;
 #endif
 #ifdef AUTH_MODULES
-	passdb_module = auth_module_open(name);
+	passdb_module = passdb != NULL ? NULL : auth_module_open(name);
 	if (passdb_module != NULL) {
 		passdb = auth_module_sym(passdb_module,
 					 t_strconcat("passdb_", name, NULL));

Index: userdb.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/userdb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- userdb.c	6 Mar 2003 23:20:16 -0000	1.5
+++ userdb.c	14 Mar 2003 22:15:43 -0000	1.6
@@ -46,11 +46,11 @@
 		userdb = &userdb_ldap;
 #endif
 #ifdef USERDB_PGSQL
-    if (strcasecmp(name, "pgsql") == 0)
-        userdb = &userdb_pgsql;
+	if (strcasecmp(name, "pgsql") == 0)
+		userdb = &userdb_pgsql;
 #endif
 #ifdef AUTH_MODULES
-	userdb_module = auth_module_open(name);
+	userdb_module = userdb != NULL ? NULL : auth_module_open(name);
 	if (userdb_module != NULL) {
 		userdb = auth_module_sym(userdb_module,
 					 t_strconcat("userdb_", name, NULL));