auth: Remove vpopmail user & pass db support

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]),

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

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 \

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

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);

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);