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 1445b0c41f226df49a6b9c5df5c56d99f79b88b3..b51269d174532c6e1c5761f4029c89ff5b5005de 100644 (file)
--- 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 02f9285b87a835c408e9e1af7f75f093f31e0c99..65d336e0b40ea8460871f42d8cb91f6ea43760fe 100644 (file)
--- 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 88103dc2fa54cfa669da269e1e0fa9095c8cb277..19880aed02b0e6ee3989d194d4d5ffde6bf8a0ce 100644 (file)
--- 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 f486775e37c053ea2a43e953c1884c75307eb7d1..056b25f7effbe9fa7a57dfc53c65085a5d0f3632 100644 (file)
--- 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 3cc2850038886f643e4c3825dd7cd4d1f6b9045e..5f44eaad4421a6b01f36cdf9d1c3364be7bc5d97 100644 (file)
--- 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 c0cecd20a2f7beb97e3418f68261489fbbb39359..fb141c068e1d8e13d75d44dfe049dbd236294366 100644 (file)
--- 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 7d83764855cb7da723c0e0d27efc1ee41cad0cdd..a1698aa4113bd1e7952c8c51be7489a28779b93b 100644 (file)
--- 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 ac82079aecf80e4adbb3650c233ad8d6eb3b9476..154e94965c9c3e9ccb353144fd6997a2cd52f777 100644 (file)
--- 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 b6d9686913ab669fab687ecbb59ead9e6793270f..ce2ec560b5646bca512674f84d5bfa59e4b090a7 100644 (file)
--- 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 f0c60b2ca6589a7ddd68b3abad9a848cdef3c41f..fc2ab6de3b23beeec2d760ce088071382e87605c 100644 (file)
--- 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 dee74bb16bc8cd24b5b9d714a5544b6eb3f677ea..f27bb5e98fc75ae18bbefa90afd34a579bcdcb11 100644 (file)
--- 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 327bfd327426e4a115b4258447f3ddf083af6097..b1734be3a816224bf8a816e639410fe3b83b9090 100644 (file)
--- 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 99d7562e07a542a8a426e3a482570cd60f7af364..fec802d558012d83ed80eaf78f408b7c94129727 100644 (file)
--- 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 8aab1975de83265a9a6a0c800eb1b1d3edd81680..35e90ccc29fcf3adefd846b459a4db9b766b109c 100644 (file)
--- 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 19a044e3d4f7fa1e9b978c1e53260e35b273ba6a..5e7dfbc55033c6aaa738a428662a731cb6946b93 100644 (file)
--- 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;