From: Timo Sirainen <tss@iki.fi>
Date: Fri, 14 Mar 2003 22:15:43 +0000 (+0200)
Subject: cleanups
X-Git-Tag: 1.1.alpha1~4809
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d239203867965ad42f38747f0b84e7314d215d3;p=thirdparty%2Fdovecot%2Fcore.git

cleanups

--HG--
branch : HEAD
---

diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index 27ee564146..869516eb3d 100644
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -107,11 +107,11 @@ void passdb_init(void)
 		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));
diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index 712d78bbfe..357ffbd87e 100644
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -46,11 +46,11 @@ void userdb_init(void)
 		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));