auth: Move contents of mech.h to sasl-server headers

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index a13f7198108b714b7d6e6e5f9d07faa34cd3e0af..b8ed497414ab053c4c1af6e0c4b28df7a30887b8 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -163,9 +163,10 @@ headers = \
        db-sql.h \
        db-passwd-file.h \
        db-oauth2.h \
-       mech.h \
        mech-otp.h \
        mech-digest-md5-private.h \
+       sasl-server.h \
+       sasl-server-protected.h \
        sasl-server-mech-plain-common.h \
        sasl-server-mech-scram.h \
        passdb.h \

diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c
index e281ad380091a40ce3dd196dee27a632346df11e..48a1a6dfde5d714213d6833b6dce2bde7fdc4cee 100644 (file)
--- a/src/auth/auth-client-connection.c
+++ b/src/auth/auth-client-connection.c
@@ -10,7 +10,7 @@
 #include "str-sanitize.h"
 #include "randgen.h"
 #include "master-service.h"
-#include "mech.h"
+#include "sasl-server-protected.h" // FIXME: remove
 #include "auth-request-handler.h"
 #include "auth-client-interface.h"
 #include "auth-client-connection.h"

diff --git a/src/auth/auth-request-handler-private.h b/src/auth/auth-request-handler-private.h
index 4d733dfb16e7b301bbdc09264749f718623bc3da..f2dbca0c11af3563f4713a394d96feb1e466e8ee 100644 (file)
--- a/src/auth/auth-request-handler-private.h
+++ b/src/auth/auth-request-handler-private.h
@@ -1,6 +1,8 @@
 #ifndef AUTH_REQUEST_HANDLER_PRIVATE_H
 #define AUTH_REQUEST_HANDLER_PRIVATE_H
 
+#include "auth-request-handler.h"
+
 struct auth_request;
 struct auth_client_connection;
 

diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index cfe3d223f3bbe299049604e9a510c951ec3a48cb..414283382a0754d5c9cbecb2507f1ce190597fa7 100644 (file)
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -8,7 +8,7 @@
 #include "array.h"
 #include "net.h"
 #include "var-expand.h"
-#include "mech.h"
+#include "sasl-server-protected.h" // FIXME: Use public API only
 #include "userdb.h"
 #include "passdb.h"
 #include "auth-request-var-expand.h"

diff --git a/src/auth/auth-sasl-mech-apop.c b/src/auth/auth-sasl-mech-apop.c
index a3d3c5bdf351e45adc74a2253d2170c8c7dc295d..d00533ee2797a9d1dc7feadb14ef073ddd0df628 100644 (file)
--- a/src/auth/auth-sasl-mech-apop.c
+++ b/src/auth/auth-sasl-mech-apop.c
@@ -7,10 +7,10 @@
  */
 
 #include "auth-common.h"
-#include "mech.h"
 #include "passdb.h"
 #include "md5.h"
 #include "buffer.h"
+#include "sasl-server-protected.h"
 #include "auth-client-connection.h"
 #include "auth-master-connection.h"
 

diff --git a/src/auth/auth-sasl-mech-dovecot-token.c b/src/auth/auth-sasl-mech-dovecot-token.c
index 7282269cf247647183b4ce713b0ad424bce9800c..e48c609f2ee8860cb39b438959f535c41abc3e60 100644 (file)
--- a/src/auth/auth-sasl-mech-dovecot-token.c
+++ b/src/auth/auth-sasl-mech-dovecot-token.c
@@ -4,8 +4,8 @@
    (e.g. imap to imap-urlauth). See auth-token.c */
 
 #include "auth-common.h"
-#include "mech.h"
 #include "safe-memset.h"
+#include "sasl-server-protected.h"
 #include "auth-token.h"
 
 static void

diff --git a/src/auth/auth.c b/src/auth/auth.c
index bb6ead914153af34973c8331dbf636006e3c9346..738d07cc20183742c1e7f88f62f92ba991cbf2dd 100644 (file)
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -3,7 +3,6 @@
 #include "auth-common.h"
 #include "array.h"
 #include "settings.h"
-#include "mech.h"
 #include "userdb.h"
 #include "passdb.h"
 #include "auth.h"

diff --git a/src/auth/main.c b/src/auth/main.c
index 6151eb521a6f046f618b2a6b297844fa55e29081..a85b8dca3927ad24193743e148be6c6d7184f147 100644 (file)
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -19,7 +19,7 @@
 #include "dict.h"
 #include "password-scheme.h"
 #include "passdb-cache.h"
-#include "mech.h"
+#include "sasl-server-protected.h"
 #include "otp.h"
 #include "mech-otp.h"
 #include "auth.h"

diff --git a/src/auth/mech.c b/src/auth/mech.c
index cd3c186fd19b5a1511a91104e7237aecd88d80e7..c1fcabbdacf4990ed4e275a7d8bf08332cedb619 100644 (file)
--- a/src/auth/mech.c
+++ b/src/auth/mech.c
@@ -2,11 +2,12 @@
 
 #include "auth-common.h"
 #include "ioloop.h"
-#include "mech.h"
 #include "str.h"
 #include "strfuncs.h"
 #include "passdb.h"
 
+#include "sasl-server-private.h"
+
 #include <ctype.h>
 
 static struct mech_module_list *mech_modules;

diff --git a/src/auth/sasl-server-mech-anonymous.c b/src/auth/sasl-server-mech-anonymous.c
index 6503bf13fd2fde181b7076632308ac15d77d6264..d0a729bb60eb8401eabaf392701f33e54158622d 100644 (file)
--- a/src/auth/sasl-server-mech-anonymous.c
+++ b/src/auth/sasl-server-mech-anonymous.c
@@ -1,7 +1,8 @@
 /* Copyright (c) 2002-2018 Dovecot authors, see the included COPYING file */
 
 #include "auth-common.h"
-#include "mech.h"
+
+#include "sasl-server-protected.h"
 
 static void
 mech_anonymous_auth_continue(struct auth_request *request,

diff --git a/src/auth/sasl-server-mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c
index 9536d065e72d36313ae23db9aab98e830de748ad..e5956073cfc59750615a8e30c7aab3271f037bf2 100644 (file)
--- a/src/auth/sasl-server-mech-cram-md5.c
+++ b/src/auth/sasl-server-mech-cram-md5.c
@@ -11,10 +11,11 @@
 #include "hmac.h"
 #include "md5.h"
 #include "randgen.h"
-#include "mech.h"
 #include "passdb.h"
 #include "hostpid.h"
 
+#include "sasl-server-protected.h"
+
 #include <time.h>
 
 struct cram_auth_request {

diff --git a/src/auth/sasl-server-mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c
index cf65a993fdbbc12c6647537885fc7dfea68d64e6..f6b9f586d182283c7cf5bd230444eb7bedcf27a7 100644 (file)
--- a/src/auth/sasl-server-mech-digest-md5.c
+++ b/src/auth/sasl-server-mech-digest-md5.c
@@ -11,10 +11,11 @@
 #include "randgen.h"
 #include "str.h"
 #include "str-sanitize.h"
-#include "mech.h"
 #include "passdb.h"
 #include "settings-parser.h"
 
+#include "sasl-server-protected.h"
+
 /* Linear whitespace */
 #define IS_LWS(c) ((c) == ' ' || (c) == '\t')
 

diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c
index a2c35117299ad63f5f2b32f6206751df883a9b79..281fd32ab7575570a21a4eff7c9e25b3e34d2b3e 100644 (file)
--- a/src/auth/sasl-server-mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -2,7 +2,8 @@
 
 #include "auth-common.h"
 #include "passdb.h"
-#include "mech.h"
+
+#include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
 
 static void

diff --git a/src/auth/sasl-server-mech-gssapi.c b/src/auth/sasl-server-mech-gssapi.c
index 0ce1c0603408fd365dbb66200540b6740f6e2994..efcee7bb8112ca6a65008a47ff4b7925ab3aee32 100644 (file)
--- a/src/auth/sasl-server-mech-gssapi.c
+++ b/src/auth/sasl-server-mech-gssapi.c
@@ -18,9 +18,10 @@
 #include "str-sanitize.h"
 #include "hex-binary.h"
 #include "safe-memset.h"
-#include "mech.h"
 #include "passdb.h"
 
+#include "sasl-server-protected.h"
+
 #if defined(BUILTIN_GSSAPI) || defined(PLUGIN_BUILD)
 
 #ifdef HAVE_GSSAPI_GSSAPI_H

diff --git a/src/auth/sasl-server-mech-login.c b/src/auth/sasl-server-mech-login.c
index cf5c86ae35c55ff31a9bb38b6305061033b6645f..f0bcfc8c2c4ed723d67c8f89fd95d89185b82529 100644 (file)
--- a/src/auth/sasl-server-mech-login.c
+++ b/src/auth/sasl-server-mech-login.c
@@ -7,11 +7,11 @@
  */
 
 #include "auth-common.h"
-#include "mech.h"
 #include "passdb.h"
 #include "safe-memset.h"
-#include "sasl-server-mech-plain-common.h"
 
+#include "sasl-server-protected.h"
+#include "sasl-server-mech-plain-common.h"
 
 static void
 mech_login_auth_continue(struct auth_request *request,

diff --git a/src/auth/sasl-server-mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c
index 5650532db9eab776600fc4140244102fa0cbea33..af4e26a2f22185ce1434d1c1cb79e34612c6e186 100644 (file)
--- a/src/auth/sasl-server-mech-oauth2.c
+++ b/src/auth/sasl-server-mech-oauth2.c
@@ -7,12 +7,13 @@
 #include "str.h"
 #include "strescape.h"
 #include "json-ostream.h"
-#include "mech.h"
 #include "passdb.h"
 #include "auth-gs2.h"
 #include "db-oauth2.h"
 #include "oauth2.h"
 
+#include "sasl-server-protected.h"
+
 struct oauth2_auth_request {
        struct auth_request request;
        struct db_oauth2 *db;

diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c
index 9f1272df9388b63299da6ac33280bdfd121bb72e..cd6fbc1953e35aa5ef46e3deb529c9821a5cff52 100644 (file)
--- a/src/auth/sasl-server-mech-otp.c
+++ b/src/auth/sasl-server-mech-otp.c
@@ -9,11 +9,11 @@
 #include "auth-common.h"
 #include "safe-memset.h"
 #include "hash.h"
-#include "mech.h"
 #include "passdb.h"
 #include "hex-binary.h"
 #include "otp.h"
 
+#include "sasl-server-protected.h"
 #include "mech-otp.h"
 
 struct otp_auth_request {

diff --git a/src/auth/sasl-server-mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c
index 41a15b4f3a5f71f3da8076eaf563f8097b874901..377f1e03fffa203685a91df4db1a4a2847bc20a5 100644 (file)
--- a/src/auth/sasl-server-mech-plain-common.c
+++ b/src/auth/sasl-server-mech-plain-common.c
@@ -1,8 +1,9 @@
 /* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
 
 #include "auth-common.h"
-#include "mech.h"
 #include "passdb.h"
+
+#include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
 
 void plain_verify_callback(enum passdb_result result,

diff --git a/src/auth/sasl-server-mech-plain.c b/src/auth/sasl-server-mech-plain.c
index 47f8470f26f4babe61106cf5dceeaa6bcb49336f..5bebeb3770c05466edeae6220da6382d749b9f81 100644 (file)
--- a/src/auth/sasl-server-mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -2,8 +2,9 @@
 
 #include "auth-common.h"
 #include "safe-memset.h"
-#include "mech.h"
 #include "passdb.h"
+
+#include "sasl-server-protected.h"
 #include "sasl-server-mech-plain-common.h"
 
 static void

diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c
index 8d5ffd747d34547bb39b21766cf74d89dff91d97..7522e3fe36c663dc386a2aa6e190b620fc80d181 100644 (file)
--- a/src/auth/sasl-server-mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -4,7 +4,8 @@
 #include "sha1.h"
 #include "sha2.h"
 #include "auth-scram-server.h"
-#include "mech.h"
+
+#include "sasl-server-protected.h"
 #include "sasl-server-mech-scram.h"
 
 struct scram_auth_request {

diff --git a/src/auth/sasl-server-mech-winbind.c b/src/auth/sasl-server-mech-winbind.c
index d8022d8be161bc47020150edd60514942a81ae60..0b67c38b0ee264bcc55208373d04d038ee0e1525 100644 (file)
--- a/src/auth/sasl-server-mech-winbind.c
+++ b/src/auth/sasl-server-mech-winbind.c
@@ -9,7 +9,6 @@
 
 #include "auth-common.h"
 #include "lib-signals.h"
-#include "mech.h"
 #include "str.h"
 #include "buffer.h"
 #include "base64.h"
@@ -17,6 +16,8 @@
 #include "istream.h"
 #include "ostream.h"
 
+#include "sasl-server-protected.h"
+
 #include <unistd.h>
 #include <sys/wait.h>
 

diff --git a/src/auth/sasl-server-private.h b/src/auth/sasl-server-private.h
new file mode 100644 (file)
index 0000000..a19d342
--- /dev/null
+++ b/src/auth/sasl-server-private.h
@@ -0,0 +1,6 @@
+#ifndef SASL_SERVER_PRIVATE_H
+#define SASL_SERVER_PRIVATE_H
+
+#include "sasl-server-protected.h"
+
+#endif

diff --git a/src/auth/mech.h b/src/auth/sasl-server-protected.h
similarity index 67%
rename from src/auth/mech.h
rename to src/auth/sasl-server-protected.h
index ffd7838da94ef328f70fabe224a3c44ad8ce4259..8b5110dbfdb14710039648dac6e500fd008ea442 100644 (file)
--- a/src/auth/mech.h
+++ b/src/auth/sasl-server-protected.h
@@ -1,28 +1,11 @@
-#ifndef MECH_H
-#define MECH_H
+#ifndef SASL_SERVER_PROTECTED_H
+#define SASL_SERVER_PROTECTED_H
 
-#include "auth-client-interface.h"
-
-struct auth_settings;
-struct auth_request;
-
-#include "auth-request.h"
 #include "auth-request-handler.h"
 
-enum mech_passdb_need {
-       /* Mechanism doesn't need a passdb at all */
-       MECH_PASSDB_NEED_NOTHING = 0,
-       /* Mechanism just needs to verify a given plaintext password */
-       MECH_PASSDB_NEED_VERIFY_PLAIN,
-       /* Mechanism needs to verify a given challenge+response combination,
-          i.e. there is only a single response from client.
-          (Currently implemented the same as _LOOKUP_CREDENTIALS) */
-       MECH_PASSDB_NEED_VERIFY_RESPONSE,
-       /* Mechanism needs to look up credentials with appropriate scheme */
-       MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
-       /* Mechanism needs to look up credentials and also modify them */
-       MECH_PASSDB_NEED_SET_CREDENTIALS
-};
+#include "sasl-server.h"
+
+struct auth_request;
 
 struct mech_module {
        const char *mech_name;

diff --git a/src/auth/sasl-server.h b/src/auth/sasl-server.h
new file mode 100644 (file)
index 0000000..8cba078
--- /dev/null
+++ b/src/auth/sasl-server.h
@@ -0,0 +1,23 @@
+#ifndef SASL_SERVER_H
+#define SASL_SERVER_H
+
+#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,
+       /* Mechanism just needs to verify a given plaintext password */
+       MECH_PASSDB_NEED_VERIFY_PLAIN,
+       /* Mechanism needs to verify a given challenge+response combination,
+          i.e. there is only a single response from client.
+          (Currently implemented the same as _LOOKUP_CREDENTIALS) */
+       MECH_PASSDB_NEED_VERIFY_RESPONSE,
+       /* Mechanism needs to look up credentials with appropriate scheme */
+       MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
+       /* Mechanism needs to look up credentials and also modify them */
+       MECH_PASSDB_NEED_SET_CREDENTIALS
+};
+
+#endif

diff --git a/src/auth/test-auth.c b/src/auth/test-auth.c
index be8b42ebc6ceb1c3fc3a7f36cdf2c550fe4cacdd..7d6c8a20e9164eb01ed52592a286113d1cda9c0d 100644 (file)
--- a/src/auth/test-auth.c
+++ b/src/auth/test-auth.c
@@ -6,7 +6,7 @@
 #include "auth-settings.h"
 #include "auth-token.h"
 #include "auth-penalty.h"
-#include "mech.h"
+#include "sasl-server-protected.h" // FIXME: remove
 #include "otp.h"
 #include "mech-otp.h"
 #include "db-oauth2.h"