Rename lib-auth to lib-auth-client.

diff --git a/configure.ac b/configure.ac
index b50754366df641c4abeb2d6121745390c92d4012..d5d1e4813c6c785ec344d2440d2c142de7c792af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -539,7 +539,7 @@ LIBDOVECOT_LA_LIBS='\
        $(top_builddir)/src/lib-imap/libimap.la \
        $(top_builddir)/src/lib-mail/libmail.la \
        $(top_builddir)/src/lib-sasl/libsasl.la \
-       $(top_builddir)/src/lib-auth/libauth.la \
+       $(top_builddir)/src/lib-auth-client/libauth-client.la \
        $(top_builddir)/src/lib-charset/libcharset.la \
        $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la \
        $(top_builddir)/src/lib-dcrypt/libdcrypt.la \
@@ -734,7 +734,7 @@ doc/example-config/conf.d/Makefile
 src/Makefile
 src/lib/Makefile
 src/lib-sql/Makefile
-src/lib-auth/Makefile
+src/lib-auth-client/Makefile
 src/lib-charset/Makefile
 src/lib-compression/Makefile
 src/lib-dcrypt/Makefile

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 4c6b28dd6fc901db291bfd5fc343e43bb6ffc80d..47e196627c6dcea5aec709829f08a0ba8a536d8c 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -28,7 +28,7 @@ LIBDOVECOT_DSYNC_DEPS="@LIBDOVECOT_DSYNC@"
 LIBDOVECOT_LIBFTS_DEPS="@LIBDOVECOT_LIBFTS@"
 LIBDOVECOT_LUA_DEPS="@LIBDOVECOT_LUA@"
 
-LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-login -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
+LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-smtp -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth-client -I$(incdir)/src/lib-login -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-dcrypt -I$(incdir)/src/lib-program-client"
 LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"
 LIBDOVECOT_AUTH_INCLUDE="-I$(incdir)/src/auth"
 LIBDOVECOT_DOVEADM_INCLUDE="-I$(incdir)/src/lib-doveadm -I$(incdir)/src/doveadm"

diff --git a/src/Makefile.am b/src/Makefile.am
index 038cf09db2ba1fa566239c964c1bffb3a424c6e0..8895d1a9d0b166050d60e9769affab9f29766785 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ LIBDOVECOT_SUBDIRS = \
        lib-test \
        lib \
        lib-settings \
-       lib-auth \
+       lib-auth-client \
        lib-dns \
        lib-ssl-iostream \
        lib-master \

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 36a1f3e1253d429e94eebd9c0a14e4821e765867..c3020d54adb4d4643657c60a28ba1b5223084029 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -37,7 +37,7 @@ pkglibexec_PROGRAMS = auth
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-dns \

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index 1d7402be4fff48a0a30694160e9c1c5f65ab6a31..b9b75bd52184cc950b717890a23318d66c670244 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-compression \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-doveadm \

diff --git a/src/imap-login/Makefile.am b/src/imap-login/Makefile.am
index 9d498c25ece83936bb7a2b41e884f7423ae0d7a3..b821c13956440a8492eb06d29c578b211f5f86ed 100644 (file)
--- a/src/imap-login/Makefile.am
+++ b/src/imap-login/Makefile.am
@@ -5,7 +5,7 @@ pkglibexec_PROGRAMS = imap-login
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-sasl \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-master \

diff --git a/src/imap-urlauth/Makefile.am b/src/imap-urlauth/Makefile.am
index a1553cf292cd5277db1a70f6d0033f01e34f24a6..2942c725f8819e871d4fc61e853aecf2be8ed403 100644 (file)
--- a/src/imap-urlauth/Makefile.am
+++ b/src/imap-urlauth/Makefile.am
@@ -6,7 +6,7 @@ pkglibexec_PROGRAMS = imap-urlauth-login imap-urlauth imap-urlauth-worker
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-login \
        $(BINARY_CFLAGS)

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth-client/Makefile.am
similarity index 94%
rename from src/lib-auth/Makefile.am
rename to src/lib-auth-client/Makefile.am
index c1515532a233416fae50686d64851c3c99fec840..ffdebeea3c4d1de901d35a7970d0e52791eab7bb 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth-client/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libauth.la
+noinst_LTLIBRARIES = libauth-client.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-test
 
-libauth_la_SOURCES = \
+libauth_client_la_SOURCES = \
        auth-client.c \
        auth-client-request.c \
        auth-client-connection.c \

diff --git a/src/lib-auth/auth-client-connection.c b/src/lib-auth-client/auth-client-connection.c
similarity index 100%
rename from src/lib-auth/auth-client-connection.c
rename to src/lib-auth-client/auth-client-connection.c

diff --git a/src/lib-auth/auth-client-interface.h b/src/lib-auth-client/auth-client-interface.h
similarity index 100%
rename from src/lib-auth/auth-client-interface.h
rename to src/lib-auth-client/auth-client-interface.h

diff --git a/src/lib-auth/auth-client-private.h b/src/lib-auth-client/auth-client-private.h
similarity index 100%
rename from src/lib-auth/auth-client-private.h
rename to src/lib-auth-client/auth-client-private.h

diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth-client/auth-client-request.c
similarity index 100%
rename from src/lib-auth/auth-client-request.c
rename to src/lib-auth-client/auth-client-request.c

diff --git a/src/lib-auth/auth-client.c b/src/lib-auth-client/auth-client.c
similarity index 100%
rename from src/lib-auth/auth-client.c
rename to src/lib-auth-client/auth-client.c

diff --git a/src/lib-auth/auth-client.h b/src/lib-auth-client/auth-client.h
similarity index 100%
rename from src/lib-auth/auth-client.h
rename to src/lib-auth-client/auth-client.h

diff --git a/src/lib-auth/auth-master.c b/src/lib-auth-client/auth-master.c
similarity index 100%
rename from src/lib-auth/auth-master.c
rename to src/lib-auth-client/auth-master.c

diff --git a/src/lib-auth/auth-master.h b/src/lib-auth-client/auth-master.h
similarity index 100%
rename from src/lib-auth/auth-master.h
rename to src/lib-auth-client/auth-master.h

diff --git a/src/lib-auth/auth-proxy.c b/src/lib-auth-client/auth-proxy.c
similarity index 100%
rename from src/lib-auth/auth-proxy.c
rename to src/lib-auth-client/auth-proxy.c

diff --git a/src/lib-auth/auth-proxy.h b/src/lib-auth-client/auth-proxy.h
similarity index 100%
rename from src/lib-auth/auth-proxy.h
rename to src/lib-auth-client/auth-proxy.h

diff --git a/src/lib-auth/test-auth-client.c b/src/lib-auth-client/test-auth-client.c
similarity index 100%
rename from src/lib-auth/test-auth-client.c
rename to src/lib-auth-client/test-auth-client.c

diff --git a/src/lib-auth/test-auth-master.c b/src/lib-auth-client/test-auth-master.c
similarity index 100%
rename from src/lib-auth/test-auth-master.c
rename to src/lib-auth-client/test-auth-master.c

diff --git a/src/lib-doveadm/Makefile.am b/src/lib-doveadm/Makefile.am
index b1233ae9e53ac14b0275e9780d61dce3758df6c7..91b0c166452aa89721a868337b12dfe5cbe7a8b9 100644 (file)
--- a/src/lib-doveadm/Makefile.am
+++ b/src/lib-doveadm/Makefile.am
@@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libdoveadm.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-dns \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-master \

diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am
index 3571f0579463616390edc29c0da443fce4e1c3d5..7e912861ec465e6689f74a44d239669a5084c4e1 100644 (file)
--- a/src/lib-http/Makefile.am
+++ b/src/lib-http/Makefile.am
@@ -143,7 +143,7 @@ test_http_libs = \
        ../lib-dns/libdns.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-settings/libsettings.la \
        $(test_libs)
 test_http_deps = \
@@ -151,7 +151,7 @@ test_http_deps = \
        ../lib-dns/libdns.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-settings/libsettings.la \
        $(test_deps)
 

diff --git a/src/lib-login/Makefile.am b/src/lib-login/Makefile.am
index 1958c4e246b2e59c8528e475ce76c82c3f6aa751..ecbb409f317b6ef8aee2cd4369df14070724156f 100644 (file)
--- a/src/lib-login/Makefile.am
+++ b/src/lib-login/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = liblogin.la
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-master
 
 liblogin_la_SOURCES = \
@@ -30,7 +30,7 @@ noinst_PROGRAMS = $(test_programs)
 test_libs = \
        liblogin.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-dns/libdns.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-settings/libsettings.la \
@@ -41,7 +41,7 @@ test_libs = \
 test_deps = \
        liblogin.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-dns/libdns.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-settings/libsettings.la \

diff --git a/src/lib-oauth2/Makefile.am b/src/lib-oauth2/Makefile.am
index 458b61274cd2004ad31956322f9c3ce5776b0a83..af5f66916b1e985542b7a2ff371484015efbe5fa 100644 (file)
--- a/src/lib-oauth2/Makefile.am
+++ b/src/lib-oauth2/Makefile.am
@@ -34,7 +34,7 @@ test_libs = \
        ../lib-dns/libdns.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-dict/libdict.la \
        ../lib-settings/libsettings.la \
        ../lib-test/libtest.la \
@@ -47,7 +47,7 @@ test_deps = \
        ../lib-dns/libdns.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-dict/libdict.la \
        ../lib-settings/libsettings.la \
        ../lib-test/libtest.la \

diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am
index 26b1c29925f51662f8f4552c7efb79b8d8ccf1c8..3763c6f94bfc636f1b6ac8288777ffd1c2874ed2 100644 (file)
--- a/src/lib-smtp/Makefile.am
+++ b/src/lib-smtp/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-sasl \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-ssl-iostream \
        -I$(top_srcdir)/src/lib-dns \
        -I$(top_srcdir)/src/lib-program-client \
@@ -107,7 +107,7 @@ test_libs = \
        ../lib-mail/libmail.la \
        ../lib-charset/libcharset.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-settings/libsettings.la \
        ../lib-sasl/libsasl.la \
@@ -122,7 +122,7 @@ test_deps = \
        ../lib-mail/libmail.la \
        ../lib-charset/libcharset.la \
        ../lib-master/libmaster.la \
-       ../lib-auth/libauth.la \
+       ../lib-auth-client/libauth-client.la \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-settings/libsettings.la \
        ../lib-sasl/libsasl.la \

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 6f44e5095d2c010baeb02dbd25eaa92d3375c0ff..9815623c5e496aef270658026d5d4d1542a138ff 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libstorage.la
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-sasl \
        -I$(top_srcdir)/src/lib-ssl-iostream \

diff --git a/src/lmtp/Makefile.am b/src/lmtp/Makefile.am
index 316e5ccef615a6830957eb2b7261fd9a65fc72bb..aed80bd96a096bbd2f1d708a0de5c290d7ecc587 100644 (file)
--- a/src/lmtp/Makefile.am
+++ b/src/lmtp/Makefile.am
@@ -5,7 +5,7 @@ pkglibexec_PROGRAMS = lmtp
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-smtp \
        -I$(top_srcdir)/src/lib-imap \

diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am
index 7366d147350401dd2d4b04b967a069b4d8af44cb..9c3afa1ce2d2efec2897713c5e25014824c988e0 100644 (file)
--- a/src/login-common/Makefile.am
+++ b/src/login-common/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = liblogin.la
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-sasl \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-login \

diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am
index 275257c5a441ecd99258e98fbd1ebe905f2678fd..135d24e34a7176709c03e0d3781e41d34b113d56 100644 (file)
--- a/src/pop3-login/Makefile.am
+++ b/src/pop3-login/Makefile.am
@@ -5,7 +5,7 @@ pkglibexec_PROGRAMS = pop3-login
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-sasl \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-login \

diff --git a/src/replication/replicator/Makefile.am b/src/replication/replicator/Makefile.am
index 6af91447b21d64837d88f3072c97142646d52104..0ae85377bbac1aff54efd9abbe9ee2c8dc3f4ec1 100644 (file)
--- a/src/replication/replicator/Makefile.am
+++ b/src/replication/replicator/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/replication \
        -DPKG_STATEDIR=\""$(statedir)"\" \

diff --git a/src/submission-login/Makefile.am b/src/submission-login/Makefile.am
index 6ea039b3e9fff6eef241fd9eccb3b31a970a0004..b64f3af307789e13a824fd97f0d5a54dc5e3b82e 100644 (file)
--- a/src/submission-login/Makefile.am
+++ b/src/submission-login/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-sasl \
-       -I$(top_srcdir)/src/lib-auth \
+       -I$(top_srcdir)/src/lib-auth-client \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-login \
        -I$(top_srcdir)/src/lib-smtp \