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

diff --git a/src/auth/db-oauth2.h b/src/auth/db-oauth2.h
index 9ebc0a4823b94e482978b3890707282c1f11e610..5d06aa2d9a317367fa23a5c4c7825e9e0ac93cb8 100644 (file)
--- 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 e5956073cfc59750615a8e30c7aab3271f037bf2..32d9ea281bd2d0b0c2c07bca4446c1f08c985034 100644 (file)
--- 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 f6b9f586d182283c7cf5bd230444eb7bedcf27a7..1fe73d42fbfe3e541605fc5721d9b75df6174d57 100644 (file)
--- 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 281fd32ab7575570a21a4eff7c9e25b3e34d2b3e..3498a46495fcaab6258add81265fe3ff79f30c93 100644 (file)
--- 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 efcee7bb8112ca6a65008a47ff4b7925ab3aee32..ce7b537df7fc3fdb97772f7d1c378d2702f6eb44 100644 (file)
--- 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 f0bcfc8c2c4ed723d67c8f89fd95d89185b82529..2029aab2ad74bf58e7c9f6a4d48de1674634ef3e 100644 (file)
--- 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 af4e26a2f22185ce1434d1c1cb79e34612c6e186..a83877410e9c2e79f9b53f22f4cbffbdc740baac 100644 (file)
--- 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 cd6fbc1953e35aa5ef46e3deb529c9821a5cff52..208c1074560c8f212df4f10920ca51d8cdbf0e33 100644 (file)
--- 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 377f1e03fffa203685a91df4db1a4a2847bc20a5..d0ad91dc18a0eb9c6a54e887cfabda78e7a5f52b 100644 (file)
--- 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 5bebeb3770c05466edeae6220da6382d749b9f81..47755efa661f739113aeb42f0cdfa3255213df96 100644 (file)
--- 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 8b5110dbfdb14710039648dac6e500fd008ea442..ffd3aa0d18a2fe05d39c6ee30ac56eb23cdc34b6 100644 (file)
--- 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 8cba0788a2d727e29a40c696b8f2de7ebbf06f31..61052f37b82233c6140dbfe95858fc4a080f1a64 100644 (file)
--- 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,