From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 29 Oct 2023 02:04:00 +0000 (+0100)
Subject: auth: sasl-server - Drop remaining auth includes
X-Git-Tag: 2.4.2~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c461095575386fb7058c5feb1d7a998255a7172;p=thirdparty%2Fdovecot%2Fcore.git

auth: sasl-server - Drop remaining auth includes
---

diff --git a/src/auth/auth-sasl-mech-dovecot-token.c b/src/auth/auth-sasl-mech-dovecot-token.c
index 1445b0c41f..b51269d174 100644
--- a/src/auth/auth-sasl-mech-dovecot-token.c
+++ b/src/auth/auth-sasl-mech-dovecot-token.c
@@ -7,6 +7,7 @@
 #include "safe-memset.h"
 #include "sasl-server-protected.h"
 #include "auth-sasl.h"
+#include "auth-request.h"
 #include "auth-token.h"
 
 static void
diff --git a/src/auth/sasl-server-mech-anonymous.c b/src/auth/sasl-server-mech-anonymous.c
index 02f9285b87..65d336e0b4 100644
--- a/src/auth/sasl-server-mech-anonymous.c
+++ b/src/auth/sasl-server-mech-anonymous.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
+#include "lib.h"
 
 #include "sasl-server-protected.h"
 
diff --git a/src/auth/sasl-server-mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c
index 88103dc2fa..19880aed02 100644
--- a/src/auth/sasl-server-mech-cram-md5.c
+++ b/src/auth/sasl-server-mech-cram-md5.c
@@ -3,7 +3,7 @@
 /* CRAM-MD5 SASL authentication, see RFC-2195
    Joshua Goodall <joshua@roughtrade.net> */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "ioloop.h"
 #include "buffer.h"
 #include "hex-binary.h"
@@ -12,6 +12,7 @@
 #include "md5.h"
 #include "randgen.h"
 #include "hostpid.h"
+#include "password-scheme.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 f486775e37..056b25f7ef 100644
--- a/src/auth/sasl-server-mech-digest-md5.c
+++ b/src/auth/sasl-server-mech-digest-md5.c
@@ -2,7 +2,7 @@
 
 /* Digest-MD5 SASL authentication, see RFC-2831 */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "base64.h"
 #include "buffer.h"
 #include "hex-binary.h"
diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c
index 3cc2850038..5f44eaad44 100644
--- a/src/auth/sasl-server-mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
+#include "lib.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 c0cecd20a2..fb141c068e 100644
--- a/src/auth/sasl-server-mech-gssapi.c
+++ b/src/auth/sasl-server-mech-gssapi.c
@@ -12,7 +12,7 @@
  * This software is released under the MIT license.
  */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "env-util.h"
 #include "str.h"
 #include "str-sanitize.h"
diff --git a/src/auth/sasl-server-mech-login.c b/src/auth/sasl-server-mech-login.c
index 7d83764855..a1698aa411 100644
--- a/src/auth/sasl-server-mech-login.c
+++ b/src/auth/sasl-server-mech-login.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "auth-common.h"
+#include "lib.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 ac82079aec..154e94965c 100644
--- a/src/auth/sasl-server-mech-oauth2.c
+++ b/src/auth/sasl-server-mech-oauth2.c
@@ -1,8 +1,6 @@
 /* Copyright (c) 2017-2018 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
-#include "auth-fields.h"
-#include "ioloop.h"
+#include "lib.h"
 #include "str.h"
 #include "buffer.h"
 #include "json-ostream.h"
diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c
index b6d9686913..ce2ec560b5 100644
--- a/src/auth/sasl-server-mech-otp.c
+++ b/src/auth/sasl-server-mech-otp.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "safe-memset.h"
 #include "hash.h"
 #include "hex-binary.h"
diff --git a/src/auth/sasl-server-mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c
index f0c60b2ca6..fc2ab6de3b 100644
--- a/src/auth/sasl-server-mech-plain-common.c
+++ b/src/auth/sasl-server-mech-plain-common.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
+#include "lib.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 dee74bb16b..f27bb5e98f 100644
--- a/src/auth/sasl-server-mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "safe-memset.h"
 
 #include "sasl-server-protected.h"
diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c
index 327bfd3274..b1734be3a8 100644
--- a/src/auth/sasl-server-mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -1,8 +1,9 @@
 /* Copyright (c) 2011-2023 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "sha1.h"
 #include "sha2.h"
+#include "password-scheme.h"
 #include "auth-scram-server.h"
 
 #include "sasl-server-protected.h"
diff --git a/src/auth/sasl-server-mech-winbind.c b/src/auth/sasl-server-mech-winbind.c
index 99d7562e07..fec802d558 100644
--- a/src/auth/sasl-server-mech-winbind.c
+++ b/src/auth/sasl-server-mech-winbind.c
@@ -7,7 +7,7 @@
  * This software is released under the MIT license.
  */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "lib-signals.h"
 #include "str.h"
 #include "buffer.h"
diff --git a/src/auth/sasl-server-mech.c b/src/auth/sasl-server-mech.c
index 8aab1975de..35e90ccc29 100644
--- a/src/auth/sasl-server-mech.c
+++ b/src/auth/sasl-server-mech.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2023 Dovecot authors, see the included COPYING file */
 
-#include "auth-common.h"
+#include "lib.h"
 #include "llist.h"
 
 #include "sasl-server-private.h"
diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 19a044e3d4..5e7dfbc550 100644
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -1,8 +1,6 @@
 #ifndef SASL_SERVER_PROTECTED_H
 #define SASL_SERVER_PROTECTED_H
 
-#include "auth-request.h" // FIXME: remove
-
 #include "sasl-server.h"
 
 struct sasl_server_mech_funcs;