From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 29 Oct 2023 01:48:29 +0000 (+0100)
Subject: auth: sasl-server-mech-* - Remove passdb.h includes
X-Git-Tag: 2.4.2~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efbfc4e3c9608ca39b0ef73cb0a10f2793390bd1;p=thirdparty%2Fdovecot%2Fcore.git

auth: sasl-server-mech-* - Remove passdb.h includes
---

diff --git a/src/auth/db-oauth2.h b/src/auth/db-oauth2.h
index 9ebc0a4823..5d06aa2d9a 100644
--- a/src/auth/db-oauth2.h
+++ b/src/auth/db-oauth2.h
@@ -5,6 +5,8 @@ struct db_oauth2;
 struct oauth2_request;
 struct db_oauth2_request;
 
+#include "passdb.h"
+
 struct auth_oauth2_settings {
 	pool_t pool;
 	/* tokeninfo endpoint, format https://endpoint/somewhere?token= */
diff --git a/src/auth/sasl-server-mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c
index e5956073cf..32d9ea281b 100644
--- a/src/auth/sasl-server-mech-cram-md5.c
+++ b/src/auth/sasl-server-mech-cram-md5.c
@@ -11,7 +11,6 @@
 #include "hmac.h"
 #include "md5.h"
 #include "randgen.h"
-#include "passdb.h"
 #include "hostpid.h"
 
 #include "sasl-server-protected.h"
diff --git a/src/auth/sasl-server-mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c
index f6b9f586d1..1fe73d42fb 100644
--- a/src/auth/sasl-server-mech-digest-md5.c
+++ b/src/auth/sasl-server-mech-digest-md5.c
@@ -11,7 +11,6 @@
 #include "randgen.h"
 #include "str.h"
 #include "str-sanitize.h"
-#include "passdb.h"
 #include "settings-parser.h"
 
 #include "sasl-server-protected.h"
diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c
index 281fd32ab7..3498a46495 100644
--- a/src/auth/sasl-server-mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
 #include "auth-common.h"
-#include "passdb.h"
 
 #include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
diff --git a/src/auth/sasl-server-mech-gssapi.c b/src/auth/sasl-server-mech-gssapi.c
index efcee7bb81..ce7b537df7 100644
--- a/src/auth/sasl-server-mech-gssapi.c
+++ b/src/auth/sasl-server-mech-gssapi.c
@@ -18,7 +18,6 @@
 #include "str-sanitize.h"
 #include "hex-binary.h"
 #include "safe-memset.h"
-#include "passdb.h"
 
 #include "sasl-server-protected.h"
 
diff --git a/src/auth/sasl-server-mech-login.c b/src/auth/sasl-server-mech-login.c
index f0bcfc8c2c..2029aab2ad 100644
--- a/src/auth/sasl-server-mech-login.c
+++ b/src/auth/sasl-server-mech-login.c
@@ -7,7 +7,6 @@
  */
 
 #include "auth-common.h"
-#include "passdb.h"
 #include "safe-memset.h"
 
 #include "sasl-server-protected.h"
diff --git a/src/auth/sasl-server-mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c
index af4e26a2f2..a83877410e 100644
--- a/src/auth/sasl-server-mech-oauth2.c
+++ b/src/auth/sasl-server-mech-oauth2.c
@@ -7,7 +7,6 @@
 #include "str.h"
 #include "strescape.h"
 #include "json-ostream.h"
-#include "passdb.h"
 #include "auth-gs2.h"
 #include "db-oauth2.h"
 #include "oauth2.h"
diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c
index cd6fbc1953..208c107456 100644
--- a/src/auth/sasl-server-mech-otp.c
+++ b/src/auth/sasl-server-mech-otp.c
@@ -9,7 +9,6 @@
 #include "auth-common.h"
 #include "safe-memset.h"
 #include "hash.h"
-#include "passdb.h"
 #include "hex-binary.h"
 #include "otp.h"
 
diff --git a/src/auth/sasl-server-mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c
index 377f1e03ff..d0ad91dc18 100644
--- a/src/auth/sasl-server-mech-plain-common.c
+++ b/src/auth/sasl-server-mech-plain-common.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
 #include "auth-common.h"
-#include "passdb.h"
 
 #include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
diff --git a/src/auth/sasl-server-mech-plain.c b/src/auth/sasl-server-mech-plain.c
index 5bebeb3770..47755efa66 100644
--- a/src/auth/sasl-server-mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -2,7 +2,6 @@
 
 #include "auth-common.h"
 #include "safe-memset.h"
-#include "passdb.h"
 
 #include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 8b5110dbfd..ffd3aa0d18 100644
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -1,6 +1,7 @@
 #ifndef SASL_SERVER_PROTECTED_H
 #define SASL_SERVER_PROTECTED_H
 
+#include "passdb.h" // FIXME: remove
 #include "auth-request-handler.h"
 
 #include "sasl-server.h"
diff --git a/src/auth/sasl-server.h b/src/auth/sasl-server.h
index 8cba0788a2..61052f37b8 100644
--- a/src/auth/sasl-server.h
+++ b/src/auth/sasl-server.h
@@ -3,8 +3,6 @@
 
 #include "auth-client-interface.h"
 
-#include "passdb.h"
-
 enum mech_passdb_need {
 	/* Mechanism doesn't need a passdb at all */
 	MECH_PASSDB_NEED_NOTHING = 0,