From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Fri, 16 Oct 2020 12:28:12 +0000 (-0400)
Subject: auth: Remove support for SIA passdb
X-Git-Tag: 2.3.14.rc1~378
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cf4e1e13c58de4c426daaf3420cd5190c6b43f8;p=thirdparty%2Fdovecot%2Fcore.git

auth: Remove support for SIA passdb
---

diff --git a/configure.ac b/configure.ac
index 884d42c124..ed809185ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,11 +81,6 @@ AS_HELP_STRING([--with-gssapi=yes|plugin Build with GSSAPI authentication suppor
   TEST_WITH(gssapi, $withval, plugin),
   want_gssapi=no)
 
-AC_ARG_WITH(sia,
-AS_HELP_STRING([--with-sia], [Build with Tru64 SIA support]),
-  TEST_WITH(sia, $withval),
-  want_sia=no)
-
 AC_ARG_WITH(ldap,
 AS_HELP_STRING([--with-ldap=yes|plugin], [Build with LDAP support]),
   TEST_WITH(ldap, $withval, plugin),
@@ -561,7 +556,6 @@ DOVECOT_WANT_PAM
 DOVECOT_WANT_CHECKPASSWORD
 DOVECOT_WANT_BSDAUTH
 DOVECOT_WANT_GSSAPI
-DOVECOT_WANT_SIA
 DOVECOT_WANT_LDAP
 DOVECOT_WANT_DB
 DOVECOT_WANT_CDB
diff --git a/m4/want_sia.m4 b/m4/want_sia.m4
deleted file mode 100644
index 2edaeb9e3c..0000000000
--- a/m4/want_sia.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_DEFUN([DOVECOT_WANT_SIA], [
-  have_sia=no
-  if test $want_sia != no; then
-          AC_CHECK_FUNC(sia_validate_user, [
-                  AC_DEFINE(PASSDB_SIA,, [Build with Tru64 SIA support])
-                  AUTH_LIBS="$AUTH_LIBS -depth_ring_search"
-                  have_sia=yes
-          ], [
-            if test $want_sia = yes; then
-              AC_ERROR([Can't build with SIA support: sia_validate_user() not found])
-            fi
-          ])
-  fi
-  
-  if test $have_sia = no; then
-    not_passdb="$not_passdb sia"
-  else
-    passdb="$passdb sia"
-  fi
-])
diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 588b92c555..376bd6bba2 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -140,7 +140,6 @@ libauth_la_SOURCES = \
 	passdb-passwd-file.c \
 	passdb-pam.c \
 	passdb-shadow.c \
-	passdb-sia.c \
 	passdb-vpopmail.c \
 	passdb-sql.c \
 	passdb-static.c \
diff --git a/src/auth/passdb-sia.c b/src/auth/passdb-sia.c
deleted file mode 100644
index 70f6cefd00..0000000000
--- a/src/auth/passdb-sia.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (C) 2006 Simon L Jackson */
-
-/* Tru64 SIA support */
-
-#include "auth-common.h"
-#include "passdb.h"
-
-#ifdef PASSDB_SIA
-
-#include "safe-memset.h"
-
-#include <sia.h>
-#include <siad.h>
-#include <sys/security.h>
-
-static int checkpw_collect(int timeout ATTR_UNUSED, int rendition,
-			   uchar_t *title ATTR_UNUSED,
-			   int nprompts ATTR_UNUSED,
-			   prompt_t *prompts ATTR_UNUSED)
-{
-	switch (rendition) {
-	case SIAONELINER:
-	case SIAINFO:
-	case SIAWARNING:
-		return SIACOLSUCCESS;
-	}
-
-	/* everything else is bogus */
-	return SIACOLABORT;
-}
-
-static void
-local_sia_verify_plain(struct auth_request *request, const char *password,
-		       verify_plain_callback_t *callback)
-{
-	char *argutility = "dovecot";
-
-	e_debug(authdb_event(request), "lookup");
-
-	/* check if the password is valid */
-	if (sia_validate_user(checkpw_collect, 1, &argutility, NULL,
-			      (char *)request->fields.user, NULL, NULL, NULL,
-			      (char *)password) != SIASUCCESS) {
-		auth_request_log_password_mismatch(request, AUTH_SUBSYS_DB);
-                callback(PASSDB_RESULT_PASSWORD_MISMATCH, request);
-	} else {
-		callback(PASSDB_RESULT_OK, request);
-	}
-}
-
-struct passdb_module_interface passdb_sia = {
-        "sia",
-
-        NULL,
-        NULL,
-        NULL,
-
-        local_sia_verify_plain,
-	NULL,
-	NULL
-};
-#else
-struct passdb_module_interface passdb_sia = {
-	.name = "sia"
-};
-#endif
diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index 93ba84a9ac..dcf1a858fa 100644
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -324,7 +324,6 @@ 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_sia;
 extern struct passdb_module_interface passdb_static;
 extern struct passdb_module_interface passdb_oauth2;
 
@@ -345,7 +344,6 @@ void passdbs_init(void)
 	passdb_register_module(&passdb_vpopmail);
 	passdb_register_module(&passdb_ldap);
 	passdb_register_module(&passdb_sql);
-	passdb_register_module(&passdb_sia);
 	passdb_register_module(&passdb_static);
 	passdb_register_module(&passdb_oauth2);
 }