auth: Rename standard SASL mech-* source files to sasl-server-mech-*

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index ae952a036ac8718e410768c898a5d89451217e5c..75bdd9272d44b8b73a6e9f0e54462a1e3c904c48 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -78,13 +78,29 @@ auth_SOURCES = main.c $(auth_common_sources)
 ldap_sources = db-ldap.c db-ldap-sasl.c db-ldap-settings.c passdb-ldap.c userdb-ldap.c
 lua_sources = db-lua.c passdb-lua.c userdb-lua.c
 
+sasl_server_mechanisms = \
+       sasl-server-mech-anonymous.c \
+       sasl-server-mech-cram-md5.c \
+       sasl-server-mech-digest-md5.c \
+       sasl-server-mech-external.c \
+       sasl-server-mech-gssapi.c \
+       sasl-server-mech-login.c \
+       sasl-server-mech-oauth2.c \
+       sasl-server-mech-otp.c \
+       sasl-server-mech-plain.c \
+       sasl-server-mech-plain-common.c \
+       sasl-server-mech-scram.c \
+       sasl-server-mech-winbind.c
+
+sasl_sources = \
+       ${sasl_server_mechanisms}
+
 auth_common_sources = \
        auth.c \
        auth-cache.c \
        auth-client-connection.c \
        auth-master-connection.c \
        auth-policy.c \
-       mech-plain-common.c \
        auth-penalty.c \
        auth-request.c \
        auth-request-fields.c \
@@ -100,19 +116,9 @@ auth_common_sources = \
        db-sql.c \
        db-passwd-file.c \
        mech.c \
-       mech-anonymous.c \
-       mech-plain.c \
-       mech-login.c \
-       mech-cram-md5.c \
-       mech-digest-md5.c \
-       mech-external.c \
-       mech-gssapi.c \
-       mech-otp.c \
-       mech-scram.c \
        mech-apop.c \
-       mech-winbind.c \
        mech-dovecot-token.c \
-       mech-oauth2.c \
+       ${sasl_sources} \
        passdb.c \
        passdb-blocking.c \
        passdb-bsdauth.c \
@@ -139,10 +145,6 @@ headers = \
        auth-client-connection.h \
        auth-common.h \
        auth-master-connection.h \
-       mech-otp.h \
-       mech-plain-common.h \
-       mech-digest-md5-private.h \
-       mech-scram.h \
        auth-penalty.h \
        auth-policy.h \
        auth-request.h \
@@ -162,6 +164,10 @@ headers = \
        db-passwd-file.h \
        db-oauth2.h \
        mech.h \
+       mech-otp.h \
+       mech-digest-md5-private.h \
+       sasl-server-mech-plain-common.h \
+       sasl-server-mech-scram.h \
        passdb.h \
        passdb-blocking.h \
        passdb-cache.h \
@@ -172,7 +178,7 @@ if GSSAPI_PLUGIN
 libmech_gssapi_la_LDFLAGS = -module -avoid-version
 libmech_gssapi_la_LIBADD = $(KRB5_LIBS)
 libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) -DPLUGIN_BUILD
-libmech_gssapi_la_SOURCES = mech-gssapi.c
+libmech_gssapi_la_SOURCES = sasl-server-mech-gssapi.c
 endif
 
 if HAVE_LDAP

diff --git a/src/auth/mech-anonymous.c b/src/auth/sasl-server-mech-anonymous.c
similarity index 100%
rename from src/auth/mech-anonymous.c
rename to src/auth/sasl-server-mech-anonymous.c

diff --git a/src/auth/mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c
similarity index 100%
rename from src/auth/mech-cram-md5.c
rename to src/auth/sasl-server-mech-cram-md5.c

diff --git a/src/auth/mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c
similarity index 100%
rename from src/auth/mech-digest-md5.c
rename to src/auth/sasl-server-mech-digest-md5.c

diff --git a/src/auth/mech-external.c b/src/auth/sasl-server-mech-external.c
similarity index 97%
rename from src/auth/mech-external.c
rename to src/auth/sasl-server-mech-external.c
index dcabb4099d1f7f62ef6a97f93b6a0318e31f2343..a2c35117299ad63f5f2b32f6206751df883a9b79 100644 (file)
--- a/src/auth/mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -3,7 +3,7 @@
 #include "auth-common.h"
 #include "passdb.h"
 #include "mech.h"
-#include "mech-plain-common.h"
+#include "sasl-server-mech-plain-common.h"
 
 static void
 mech_external_auth_continue(struct auth_request *request,

diff --git a/src/auth/mech-gssapi.c b/src/auth/sasl-server-mech-gssapi.c
similarity index 100%
rename from src/auth/mech-gssapi.c
rename to src/auth/sasl-server-mech-gssapi.c

diff --git a/src/auth/mech-login.c b/src/auth/sasl-server-mech-login.c
similarity index 97%
rename from src/auth/mech-login.c
rename to src/auth/sasl-server-mech-login.c
index 5083573fccfde0fa417154283d919122c593b78d..cf5c86ae35c55ff31a9bb38b6305061033b6645f 100644 (file)
--- a/src/auth/mech-login.c
+++ b/src/auth/sasl-server-mech-login.c
@@ -10,7 +10,7 @@
 #include "mech.h"
 #include "passdb.h"
 #include "safe-memset.h"
-#include "mech-plain-common.h"
+#include "sasl-server-mech-plain-common.h"
 
 
 static void

diff --git a/src/auth/mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c
similarity index 100%
rename from src/auth/mech-oauth2.c
rename to src/auth/sasl-server-mech-oauth2.c

diff --git a/src/auth/mech-otp.c b/src/auth/sasl-server-mech-otp.c
similarity index 100%
rename from src/auth/mech-otp.c
rename to src/auth/sasl-server-mech-otp.c

diff --git a/src/auth/mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c
similarity index 91%
rename from src/auth/mech-plain-common.c
rename to src/auth/sasl-server-mech-plain-common.c
index 2d947b98b4149feea51853af66e2fdec41df9f5a..41a15b4f3a5f71f3da8076eaf563f8097b874901 100644 (file)
--- a/src/auth/mech-plain-common.c
+++ b/src/auth/sasl-server-mech-plain-common.c
@@ -3,7 +3,7 @@
 #include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
-#include "mech-plain-common.h"
+#include "sasl-server-mech-plain-common.h"
 
 void plain_verify_callback(enum passdb_result result,
                           struct auth_request *request)

diff --git a/src/auth/mech-plain-common.h b/src/auth/sasl-server-mech-plain-common.h
similarity index 100%
rename from src/auth/mech-plain-common.h
rename to src/auth/sasl-server-mech-plain-common.h

diff --git a/src/auth/mech-plain.c b/src/auth/sasl-server-mech-plain.c
similarity index 98%
rename from src/auth/mech-plain.c
rename to src/auth/sasl-server-mech-plain.c
index 1878daa82d4ee9c24f0ac856c5535e9edf47ec5b..47f8470f26f4babe61106cf5dceeaa6bcb49336f 100644 (file)
--- a/src/auth/mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -4,7 +4,7 @@
 #include "safe-memset.h"
 #include "mech.h"
 #include "passdb.h"
-#include "mech-plain-common.h"
+#include "sasl-server-mech-plain-common.h"
 
 static void
 mech_plain_auth_continue(struct auth_request *request,

diff --git a/src/auth/mech-scram.c b/src/auth/sasl-server-mech-scram.c
similarity index 99%
rename from src/auth/mech-scram.c
rename to src/auth/sasl-server-mech-scram.c
index a5e948f036c65a78dcdcb281d5c792d35dce02b0..8d5ffd747d34547bb39b21766cf74d89dff91d97 100644 (file)
--- a/src/auth/mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -5,7 +5,7 @@
 #include "sha2.h"
 #include "auth-scram-server.h"
 #include "mech.h"
-#include "mech-scram.h"
+#include "sasl-server-mech-scram.h"
 
 struct scram_auth_request {
        struct auth_request auth_request;

diff --git a/src/auth/mech-scram.h b/src/auth/sasl-server-mech-scram.h
similarity index 100%
rename from src/auth/mech-scram.h
rename to src/auth/sasl-server-mech-scram.h

diff --git a/src/auth/mech-winbind.c b/src/auth/sasl-server-mech-winbind.c
similarity index 100%
rename from src/auth/mech-winbind.c
rename to src/auth/sasl-server-mech-winbind.c