From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Fri, 16 Oct 2020 13:18:31 +0000 (-0400)
Subject: auth: Remove vpopmail user & pass db support
X-Git-Tag: 2.3.14.rc1~374
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3d02fdd7104fd4b6b8d6565c8f4910944979e23;p=thirdparty%2Fdovecot%2Fcore.git

auth: Remove vpopmail user & pass db support
---

diff --git a/configure.ac b/configure.ac
index ed809185ec..8235e34432 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,22 +91,6 @@ AS_HELP_STRING([--with-libunwind], [Build with libunwind support (auto)]),
   TEST_WITH(libunwind, $withval),
   want_libunwind=auto)
 
-AC_ARG_WITH(vpopmail,
-AS_HELP_STRING([--with-vpopmail], [Build with vpopmail support (auto)]),
-	if test x$withval = xno; then
-		want_vpopmail=no
-	else
-		if test x$withval = xyes || test x$withval = xauto; then
-			vpopmail_home="`echo ~vpopmail`"
-			want_vpopmail=$withval
-		else
-			vpopmail_home="$withval"
-			want_vpopmail=yes
-		fi
-	fi, [
-		want_vpopmail=no
-	])
-
 # Berkeley DB support is more or less broken. Disabled for now.
 #AC_ARG_WITH(db,
 #AS_HELP_STRING([--with-db], [Build with Berkeley DB support]),
diff --git a/doc/example-config/conf.d/10-auth.conf b/doc/example-config/conf.d/10-auth.conf
index 1b139d8c0d..3e9c4e4dc4 100644
--- a/doc/example-config/conf.d/10-auth.conf
+++ b/doc/example-config/conf.d/10-auth.conf
@@ -10,7 +10,7 @@
 #disable_plaintext_auth = yes
 
 # Authentication cache size (e.g. 10M). 0 means it's disabled. Note that
-# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used.
+# bsdauth and PAM require cache_key to be set for caching to be used.
 #auth_cache_size = 0
 # Time to live for cached data. After TTL expires the cached record is no
 # longer used, *except* if the main database lookup returns internal failure.
@@ -124,5 +124,4 @@ auth_mechanisms = plain
 #!include auth-ldap.conf.ext
 #!include auth-passwdfile.conf.ext
 #!include auth-checkpassword.conf.ext
-#!include auth-vpopmail.conf.ext
 #!include auth-static.conf.ext
diff --git a/doc/example-config/conf.d/Makefile.am b/doc/example-config/conf.d/Makefile.am
index 35ff25ad55..d5d509deff 100644
--- a/doc/example-config/conf.d/Makefile.am
+++ b/doc/example-config/conf.d/Makefile.am
@@ -11,7 +11,6 @@ example_DATA = \
 	auth-sql.conf.ext \
 	auth-static.conf.ext \
 	auth-system.conf.ext \
-	auth-vpopmail.conf.ext \
 	10-auth.conf \
 	10-director.conf \
 	10-logging.conf \
diff --git a/doc/example-config/conf.d/auth-vpopmail.conf.ext b/doc/example-config/conf.d/auth-vpopmail.conf.ext
deleted file mode 100644
index f2da976bd2..0000000000
--- a/doc/example-config/conf.d/auth-vpopmail.conf.ext
+++ /dev/null
@@ -1,17 +0,0 @@
-# Authentication for vpopmail users. Included from 10-auth.conf.
-#
-# <doc/wiki/AuthDatabase.VPopMail.txt>
-
-passdb {
-  driver = vpopmail
-
-  # [cache_key=<key>] [webmail=<ip>]
-  args =
-}
-
-userdb {
-  driver = vpopmail
-
-  # [quota_template=<template>] - %q expands to Maildir++ quota
-  args = quota_template=quota_rule=*:backend=%q
-}
diff --git a/m4/want_vpopmail.m4 b/m4/want_vpopmail.m4
deleted file mode 100644
index fd8ff6adec..0000000000
--- a/m4/want_vpopmail.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-AC_DEFUN([DOVECOT_WANT_VPOPMAIL], [
-  have_vpopmail=no
-  if test $want_vpopmail != no; then
-          vpop_etc="$vpopmail_home/etc"
-          AC_MSG_CHECKING([for vpopmail configuration at $vpop_etc/lib_deps])
-          if ! test -f $vpop_etc/lib_deps; then
-                  AC_MSG_RESULT(not found)
-                  vpop_etc="$vpopmail_home"
-                  AC_MSG_CHECKING([for vpopmail configuration at $vpop_etc/lib_deps])
-          fi
-          if test -f $vpop_etc/lib_deps; then
-                  AUTH_CFLAGS="$AUTH_CFLAGS `cat $vpop_etc/inc_deps` $CFLAGS"
-                  AUTH_LIBS="$AUTH_LIBS `cat $vpop_etc/lib_deps`"
-                  AC_DEFINE(USERDB_VPOPMAIL,, [Build with vpopmail support])
-                  AC_DEFINE(PASSDB_VPOPMAIL,, [Build with vpopmail support])
-                  AC_MSG_RESULT(found)
-                  have_vpopmail=yes
-          else
-                  AC_MSG_RESULT(not found)
-                  if test $want_vpopmail = yes; then
-                    AC_ERROR([Can't build with vpopmail support: $vpop_etc/lib_deps not found])
-                  fi
-          fi
-  fi
-  
-  if test $have_vpopmail = no; then
-    not_passdb="$not_passdb vpopmail"
-    not_userdb="$not_userdb vpopmail"
-  else
-    userdb="$userdb vpopmail"
-    passdb="$passdb vpopmail"
-  fi
-])
diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 159435d40e..f9d15981cc 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -137,7 +137,6 @@ libauth_la_SOURCES = \
 	passdb-passwd-file.c \
 	passdb-pam.c \
 	passdb-shadow.c \
-	passdb-vpopmail.c \
 	passdb-sql.c \
 	passdb-static.c \
 	passdb-template.c \
@@ -149,7 +148,6 @@ libauth_la_SOURCES = \
 	userdb-passwd-file.c \
 	userdb-prefetch.c \
 	userdb-static.c \
-	userdb-vpopmail.c \
 	userdb-sql.c \
 	userdb-template.c \
 	$(ldap_sources) \
@@ -193,8 +191,7 @@ headers = \
 	password-scheme.h \
 	userdb.h \
 	userdb-blocking.h \
-	userdb-template.h \
-	userdb-vpopmail.h
+	userdb-template.h
 
 if GSSAPI_PLUGIN
 libmech_gssapi_la_LDFLAGS = -module -avoid-version
diff --git a/src/auth/db-checkpassword.c b/src/auth/db-checkpassword.c
index 6d795b252f..7663b60926 100644
--- a/src/auth/db-checkpassword.c
+++ b/src/auth/db-checkpassword.c
@@ -116,20 +116,8 @@ static void
 checkpassword_request_finish_auth(struct chkpw_auth_request *request)
 {
 	switch (request->exit_status) {
-	/* vpopmail exit codes: */
-	case 3:		/* password fail / vpopmail user not found */
-	case 12: 	/* null user name given */
-	case 13:	/* null password given */
-	case 15:	/* user has no password */
-	case 20:	/* invalid user/domain characters */
-	case 21:	/* system user not found */
-	case 22:	/* system user shadow entry not found */
-	case 23:	/* system password fail */
-
 	/* standard checkpassword exit codes: */
 	case 1:
-		/* (1 is additionally defined in vpopmail for
-		   "pop/smtp/webmail/ imap/access denied") */
 		e_info(authdb_event(request->request),
 		       "Login failed (status=%d)",
 		       request->exit_status);
diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
deleted file mode 100644
index f8dc34005e..0000000000
--- a/src/auth/passdb-vpopmail.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
-
-/* Thanks to Courier-IMAP for showing how the vpopmail API should be used */
-
-#include "auth-common.h"
-#include "passdb.h"
-
-#ifdef PASSDB_VPOPMAIL
-
-#include "safe-memset.h"
-#include "password-scheme.h"
-#include "auth-cache.h"
-
-#include "userdb-vpopmail.h"
-
-
-#define VPOPMAIL_DEFAULT_PASS_SCHEME "CRYPT"
-
-/* pw_flags was added in vpopmail 5.4, olders use pw_gid field */
-#ifndef VQPASSWD_HAS_PW_FLAGS
-#  define pw_flags pw_gid
-#endif
-
-struct vpopmail_passdb_module {
-	struct passdb_module module;
-
-	struct ip_addr webmail_ip;
-};
-
-static bool vpopmail_is_disabled(struct auth_request *request,
-				 const struct vqpasswd *vpw)
-{
-        struct passdb_module *_module = request->passdb->passdb;
-	struct vpopmail_passdb_module *module =
-		(struct vpopmail_passdb_module *)_module;
-
-	if (strcasecmp(request->fields.service, "IMAP") == 0) {
-		if ((vpw->pw_flags & NO_IMAP) != 0) {
-			/* IMAP from webmail IP may still be allowed */
-			if (!net_ip_compare(&module->webmail_ip,
-					    &request->fields.remote_ip))
-				return TRUE;
-		}
-		if ((vpw->pw_flags & NO_WEBMAIL) != 0) {
-			if (net_ip_compare(&module->webmail_ip,
-					   &request->fields.remote_ip))
-				return TRUE;
-		}
-	}
-	if ((vpw->pw_flags & NO_POP) != 0 &&
-	    strcasecmp(request->fields.service, "POP3") == 0)
-		return TRUE;
-	if ((vpw->pw_flags & NO_SMTP) != 0 &&
-	    strcasecmp(request->fields.service, "SMTP") == 0)
-		return TRUE;
-	return FALSE;
-}
-
-static char *
-vpopmail_password_lookup(struct auth_request *auth_request, bool *cleartext,
-			 enum passdb_result *result_r)
-{
-	char vpop_user[VPOPMAIL_LIMIT], vpop_domain[VPOPMAIL_LIMIT];
-	struct vqpasswd *vpw;
-	char *password;
-
-	vpw = vpopmail_lookup_vqp(auth_request, vpop_user, vpop_domain);
-	if (vpw == NULL) {
-		*result_r = PASSDB_RESULT_USER_UNKNOWN;
-		return NULL;
-	}
-
-	if (vpopmail_is_disabled(auth_request, vpw)) {
-		e_info(authdb_event(auth_request),
-		       "%s disabled in vpopmail for this user",
-		       auth_request->fields.service);
-		password = NULL;
-		*result_r = PASSDB_RESULT_USER_DISABLED;
-	} else {
-		if (vpw->pw_clear_passwd != NULL &&
-		    *vpw->pw_clear_passwd != '\0') {
-			password = t_strdup_noconst(vpw->pw_clear_passwd);
-			*cleartext = TRUE;
-		} else if (!*cleartext)
-			password = t_strdup_noconst(vpw->pw_passwd);
-		else
-			password = NULL;
-		*result_r = password != NULL ? PASSDB_RESULT_OK :
-			PASSDB_RESULT_SCHEME_NOT_AVAILABLE;
-	}
-
-	safe_memset(vpw->pw_passwd, 0, strlen(vpw->pw_passwd));
-	if (vpw->pw_clear_passwd != NULL) {
-		safe_memset(vpw->pw_clear_passwd, 0,
-			    strlen(vpw->pw_clear_passwd));
-	}
-
-	return password;
-}
-
-static void vpopmail_lookup_credentials(struct auth_request *request,
-					lookup_credentials_callback_t *callback)
-{
-	enum passdb_result result;
-	char *password;
-	bool cleartext = TRUE;
-
-	password = vpopmail_password_lookup(request, &cleartext, &result);
-	if (password == NULL) {
-		callback(result, NULL, 0, request);
-		return;
-	}
-	
-	passdb_handle_credentials(PASSDB_RESULT_OK, password, "CLEARTEXT",
-				  callback, request);
-	safe_memset(password, 0, strlen(password));
-}
-
-static void
-vpopmail_verify_plain(struct auth_request *request, const char *password,
-		      verify_plain_callback_t *callback)
-{
-	enum passdb_result result;
-	const char *scheme, *tmp_pass;
-	char *crypted_pass;
-	bool cleartext = FALSE;
-	int ret;
-
-	crypted_pass = vpopmail_password_lookup(request, &cleartext, &result);
-	if (crypted_pass == NULL) {
-		callback(result, request);
-		return;
-	}
-	tmp_pass = crypted_pass;
-
-	if (cleartext)
-		scheme = "CLEARTEXT";
-	else {
-		scheme = password_get_scheme(&tmp_pass);
-		if (scheme == NULL)
-			scheme = request->passdb->passdb->default_pass_scheme;
-	}
-
-	ret = auth_request_password_verify(request, password, tmp_pass,
-					   scheme, AUTH_SUBSYS_DB);
-	safe_memset(crypted_pass, 0, strlen(crypted_pass));
-
-	if (ret <= 0) {
-		callback(PASSDB_RESULT_PASSWORD_MISMATCH, request);
-		return;
-	}
-
-#ifdef POP_AUTH_OPEN_RELAY
-	if (strcasecmp(request->fields.service, "POP3") == 0 ||
-	    strcasecmp(request->fields.service, "IMAP") == 0) {
-		const char *host = net_ip2addr(&request->fields.remote_ip);
-		/* vpopmail 5.4 does not understand IPv6 */
-		if (host[0] != '\0' && IPADDR_IS_V4(&request->fields.remote_ip)) {
-			/* use putenv() directly rather than env_put() which
-			   would leak memory every time we got here. use a
-			   static buffer for putenv() as SUSv2 requirements
-			   would otherwise corrupt our environment later. */
-			static char ip_env[256];
-
-			i_snprintf(ip_env, sizeof(ip_env),
-				   "TCPREMOTEIP=%s", host);
-			putenv(ip_env);
-			open_smtp_relay();
-		}
-	}
-#endif
-
-	callback(PASSDB_RESULT_OK, request);
-}
-
-static struct passdb_module *
-vpopmail_preinit(pool_t pool, const char *args)
-{
-	static bool vauth_load_initialized = FALSE;
-	struct vpopmail_passdb_module *module;
-	const char *const *tmp;
-
-	module = p_new(pool, struct vpopmail_passdb_module, 1);
-	module->module.default_pass_scheme = VPOPMAIL_DEFAULT_PASS_SCHEME;
-	module->module.blocking = TRUE;
-
-	tmp = t_strsplit_spaces(args, " ");
-	for (; *tmp != NULL; tmp++) {
-		if (str_begins(*tmp, "cache_key=")) {
-			module->module.default_cache_key =
-				auth_cache_parse_key(pool, *tmp + 10);
-		} else if (str_begins(*tmp, "webmail=")) {
-			if (net_addr2ip(*tmp + 8, &module->webmail_ip) < 0)
-				i_fatal("vpopmail: Invalid webmail IP address");
-		} else if (strcmp(*tmp, "blocking=no") == 0) {
-			module->module.blocking = FALSE;
-		} else {
-			i_fatal("passdb vpopmail: Unknown setting: %s", *tmp);
-		}
-	}
-	if (!vauth_load_initialized) {
-		vauth_load_initialized = TRUE;
-		if (vauth_open(0) != 0)
-			i_fatal("vpopmail: vauth_open() failed");
-	}
-	return &module->module;
-}
-
-static void vpopmail_deinit(struct passdb_module *module ATTR_UNUSED)
-{
-	vclose();
-}
-
-struct passdb_module_interface passdb_vpopmail = {
-	"vpopmail",
-
-	vpopmail_preinit,
-	NULL,
-	vpopmail_deinit,
-
-	vpopmail_verify_plain,
-	vpopmail_lookup_credentials,
-	NULL
-};
-#else
-struct passdb_module_interface passdb_vpopmail = {
-	.name = "vpopmail"
-};
-#endif
diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index dcf1a858fa..21fd385529 100644
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -321,7 +321,6 @@ extern struct passdb_module_interface passdb_shadow;
 extern struct passdb_module_interface passdb_passwd_file;
 extern struct passdb_module_interface passdb_pam;
 extern struct passdb_module_interface passdb_checkpassword;
-extern struct passdb_module_interface passdb_vpopmail;
 extern struct passdb_module_interface passdb_ldap;
 extern struct passdb_module_interface passdb_sql;
 extern struct passdb_module_interface passdb_static;
@@ -341,7 +340,6 @@ void passdbs_init(void)
 	passdb_register_module(&passdb_pam);
 	passdb_register_module(&passdb_checkpassword);
 	passdb_register_module(&passdb_shadow);
-	passdb_register_module(&passdb_vpopmail);
 	passdb_register_module(&passdb_ldap);
 	passdb_register_module(&passdb_sql);
 	passdb_register_module(&passdb_static);
diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c
deleted file mode 100644
index 0068ec39f0..0000000000
--- a/src/auth/userdb-vpopmail.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
-
-/* Thanks to Courier-IMAP for showing how the vpopmail API should be used */
-
-#include "auth-common.h"
-#include "userdb.h"
-
-#if defined(PASSDB_VPOPMAIL) || defined(USERDB_VPOPMAIL)
-#include "str.h"
-#include "var-expand.h"
-#include "userdb-vpopmail.h"
-
-struct vpopmail_userdb_module {
-	struct userdb_module module;
-
-	const char *quota_template_key;
-	const char *quota_template_value;
-};
-
-struct vqpasswd *vpopmail_lookup_vqp(struct auth_request *request,
-				     char vpop_user[VPOPMAIL_LIMIT],
-				     char vpop_domain[VPOPMAIL_LIMIT])
-{
-	struct vqpasswd *vpw;
-
-	/* vpop_user must be zero-filled or parse_email() leaves an
-	   extra character after the user name. we'll fill vpop_domain
-	   as well just to be sure... */
-	memset(vpop_user, '\0', VPOPMAIL_LIMIT);
-	memset(vpop_domain, '\0', VPOPMAIL_LIMIT);
-
-	if (parse_email(request->fields.user, vpop_user, vpop_domain,
-			VPOPMAIL_LIMIT-1) < 0) {
-		e_info(authdb_event(request),
-		       "parse_email() failed");
-		return NULL;
-	}
-
-	e_debug(authdb_event(request),
-		"lookup user=%s domain=%s",
-		vpop_user, vpop_domain);
-
-	vpw = vauth_getpw(vpop_user, vpop_domain);
-	if (vpw == NULL) {
-		auth_request_log_unknown_user(request, AUTH_SUBSYS_DB);
-		return NULL;
-	}
-
-	return vpw;
-}
-#endif
-
-#ifdef USERDB_VPOPMAIL
-static int
-userdb_vpopmail_get_quota(const char *template, const char *vpop_str,
-			  const char **quota_r, const char **error_r)
-{
-	struct var_expand_table *tab;
-	string_t *quota;
-
-	if (template == NULL || *vpop_str == '\0' ||
-	    strcmp(vpop_str, "NOQUOTA") == 0) {
-		*quota_r = "";
-		return 0;
-	}
-
-	tab = t_new(struct var_expand_table, 2);
-	tab[0].key = 'q';
-	tab[0].value = format_maildirquota(vpop_str);
-
-	quota = t_str_new(128);
-	if (var_expand(quota, template, tab, error_r) < 0)
-		return -1;
-
-	*quota_r = str_c(quota);
-	return 0;
-}
-
-static void vpopmail_lookup(struct auth_request *auth_request,
-			    userdb_callback_t *callback)
-{
-	struct userdb_module *_module = auth_request->userdb->userdb;
-	struct vpopmail_userdb_module *module =
-		(struct vpopmail_userdb_module *)_module;
-	char vpop_user[VPOPMAIL_LIMIT], vpop_domain[VPOPMAIL_LIMIT];
-	struct vqpasswd *vpw;
-	const char *quota, *error;
-	uid_t uid;
-	gid_t gid;
-
-	vpw = vpopmail_lookup_vqp(auth_request, vpop_user, vpop_domain);
-	if (vpw == NULL) {
-		callback(USERDB_RESULT_USER_UNKNOWN, auth_request);
-		return;
-	}
-
-	/* we have to get uid/gid separately, because the gid field in
-	   struct vqpasswd isn't really gid at all but just some flags... */
-	if (vget_assign(vpop_domain, NULL, 0, &uid, &gid) == NULL) {
-		e_info(authdb_event(auth_request),
-		       "vget_assign(%s) failed", vpop_domain);
-		callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
-		return;
-	}
-
-	if (auth_request->fields.successful) {
-		/* update the last login only when we're really  */
-		vset_lastauth(vpop_user, vpop_domain,
-			      t_strdup_noconst(auth_request->fields.service));
-	}
-
-	if (vpw->pw_dir == NULL || vpw->pw_dir[0] == '\0') {
-		/* user's homedir doesn't exist yet, create it */
-		e_info(authdb_event(auth_request),
-		       "pw_dir isn't set, creating");
-
-		if (make_user_dir(vpop_user, vpop_domain, uid, gid) == NULL) {
-			e_error(authdb_event(auth_request),
-				"make_user_dir(%s, %s) failed",
-				vpop_user, vpop_domain);
-			callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
-			return;
-		}
-
-		/* get the user again so pw_dir is visible */
-		vpw = vauth_getpw(vpop_user, vpop_domain);
-		if (vpw == NULL) {
-			callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
-			return;
-		}
-	}
-
-	if (userdb_vpopmail_get_quota(module->quota_template_value,
-				      vpw->pw_shell, &quota, &error) < 0) {
-		e_error(authdb_event(auth_request),
-			"userdb_vpopmail_get_quota(%s, %s) failed: %s",
-			module->quota_template_value,
-			vpw->pw_shell, error);
-		callback(USERDB_RESULT_INTERNAL_FAILURE, auth_request);
-		return;
-	}
-
-	auth_request_set_userdb_field(auth_request, "uid", dec2str(uid));
-	auth_request_set_userdb_field(auth_request, "gid", dec2str(gid));
-	auth_request_set_userdb_field(auth_request, "home", vpw->pw_dir);
-
-	if (*quota != '\0') {
-		auth_request_set_userdb_field(auth_request,
-					      module->quota_template_key,
-					      quota);
-	}
-	callback(USERDB_RESULT_OK, auth_request);
-}
-
-static struct userdb_module *
-vpopmail_preinit(pool_t pool, const char *args)
-{
-	struct vpopmail_userdb_module *module;
-	const char *const *tmp, *p;
-
-	module = p_new(pool, struct vpopmail_userdb_module, 1);
-	module->module.blocking = TRUE;
-
-	for (tmp = t_strsplit(args, " "); *tmp != NULL; tmp++) {
-		if (str_begins(*tmp, "cache_key="))
-			module->module.default_cache_key =
-				p_strdup(pool, *tmp + 10);
-		else if (str_begins(*tmp, "quota_template=")) {
-			p = strchr(*tmp + 15, '=');
-			if (p == NULL) {
-				i_fatal("vpopmail userdb: "
-					"quota_template missing '='");
-			}
-			module->quota_template_key =
-				p_strdup_until(pool, *tmp + 15, p);
-			module->quota_template_value = p_strdup(pool, p + 1);
-		} else if (strcmp(*tmp, "blocking=no") == 0) {
-			module->module.blocking = FALSE;
-		} else
-			i_fatal("userdb vpopmail: Unknown setting: %s", *tmp);
-	}
-	return &module->module;
-}
-
-struct userdb_module_interface userdb_vpopmail = {
-	"vpopmail",
-
-	vpopmail_preinit,
-	NULL,
-	NULL,
-
-	vpopmail_lookup,
-
-	NULL,
-	NULL,
-	NULL
-};
-#else
-struct userdb_module_interface userdb_vpopmail = {
-	.name = "vpopmail"
-};
-#endif
diff --git a/src/auth/userdb-vpopmail.h b/src/auth/userdb-vpopmail.h
deleted file mode 100644
index 5b205af706..0000000000
--- a/src/auth/userdb-vpopmail.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef USERDB_VPOPMAIL_H
-#define USERDB_VPOPMAIL_H
-
-#include <stdio.h>
-#include <vpopmail.h>
-#include <vauth.h>
-
-/* Limit user and domain to 80 chars each (+1 for \0). I wouldn't recommend
-   raising this limit at least much, vpopmail is full of potential buffer
-   overflows. */
-#define VPOPMAIL_LIMIT 81
-
-struct vqpasswd *vpopmail_lookup_vqp(struct auth_request *request,
-				     char vpop_user[VPOPMAIL_LIMIT],
-				     char vpop_domain[VPOPMAIL_LIMIT]);
-
-#endif
diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index aa11025e86..dfb3cef1ed 100644
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -228,7 +228,6 @@ extern struct userdb_module_interface userdb_prefetch;
 extern struct userdb_module_interface userdb_static;
 extern struct userdb_module_interface userdb_passwd;
 extern struct userdb_module_interface userdb_passwd_file;
-extern struct userdb_module_interface userdb_vpopmail;
 extern struct userdb_module_interface userdb_ldap;
 extern struct userdb_module_interface userdb_sql;
 extern struct userdb_module_interface userdb_checkpassword;
@@ -245,7 +244,6 @@ void userdbs_init(void)
 	userdb_register_module(&userdb_passwd_file);
 	userdb_register_module(&userdb_prefetch);
 	userdb_register_module(&userdb_static);
-	userdb_register_module(&userdb_vpopmail);
 	userdb_register_module(&userdb_ldap);
 	userdb_register_module(&userdb_sql);
 	userdb_register_module(&userdb_checkpassword);
diff --git a/src/master/main.c b/src/master/main.c
index 6e0e68fe7d..e53d91bf14 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -705,9 +705,6 @@ static void print_build_options(void)
 #endif
 #ifdef PASSDB_SQL 
 		" sql"
-#endif
-#ifdef PASSDB_VPOPMAIL
-		" vpopmail"
 #endif
 	"\nUserdb:"
 #ifdef USERDB_CHECKPASSWORD
@@ -736,9 +733,6 @@ static void print_build_options(void)
 #endif
 #ifdef USERDB_STATIC 
 		" static"
-#endif
-#ifdef USERDB_VPOPMAIL
-		" vpopmail"
 #endif
 	"\n", IO_BLOCK_SIZE);
 }