From: Timo Sirainen <tss@iki.fi>
Date: Wed, 22 Sep 2010 17:19:31 +0000 (+0100)
Subject: Attempt to fix vpopmail support.
X-Git-Tag: 2.0.4~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0923dd55de857761285ff0602baa2fcb78fcd18;p=thirdparty%2Fdovecot%2Fcore.git

Attempt to fix vpopmail support.
---

diff --git a/configure.in b/configure.in
index e8d0bdc26a..be1c39e944 100644
--- a/configure.in
+++ b/configure.in
@@ -112,7 +112,6 @@ AC_ARG_WITH(vpopmail,
 			vpopmail_home="$withval"
 			want_vpopmail=yes
 		fi
-		AC_ERROR([vpopmail support is broken. fix it or access its db another way.])
 	fi, [
 		want_vpopmail=no
 	])
diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
index 724c3284b2..94bcae2c82 100644
--- a/src/auth/passdb-vpopmail.c
+++ b/src/auth/passdb-vpopmail.c
@@ -182,8 +182,8 @@ vpopmail_preinit(pool_t pool, const char *args)
 	}
 	if (!vauth_load_initialized) {
 		vauth_load_initialized = TRUE;
-		if (!vauth_load_module(NULL))
-			i_fatal("vpopmail: vauth_load_module() failed");
+		if (vauth_open(0) != 0)
+			i_fatal("vpopmail: vauth_open() failed");
 	}
 	return &module->module;
 }