Renamed headers to prevent collision if they were flattened on an install.

--HG--
branch : HEAD

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index daa3e9553c65e3fe80a540d0471e5d81213e4f69..94f7245605607a6588c221d380206510e8cdbcb3 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -56,6 +56,8 @@ dovecot_auth_SOURCES = \
        auth-cache.c \
        auth-client-connection.c \
        auth-master-connection.c \
+       mech-otp-skey-common.c \
+       mech-plain-common.c \
        auth-request.c \
        auth-request-handler.c \
        auth-settings.c \
@@ -79,8 +81,6 @@ dovecot_auth_SOURCES = \
        mech-rpa.c \
        mech-apop.c \
        mech-winbind.c \
-       otp-skey-common.c \
-       plain-common.c \
        passdb.c \
        passdb-blocking.c \
        passdb-bsdauth.c \
@@ -109,8 +109,11 @@ headers = \
        auth.h \
        auth-cache.h \
        auth-client-connection.h \
+       auth-common.h \
        auth-master-interface.h \
        auth-master-connection.h \
+       mech-otp-skey-common.h \
+       mech-plain-common.h \
        auth-request.h \
        auth-request-handler.h \
        auth-settings.h \
@@ -120,12 +123,9 @@ headers = \
        db-ldap.h \
        db-sql.h \
        db-passwd-file.h \
-       common.h \
        db-checkpassword.h \
        mech.h \
        mycrypt.h \
-       otp-skey-common.h \
-       plain-common.h \
        passdb.h \
        passdb-blocking.h \
        passdb-cache.h \

diff --git a/src/auth/auth-cache.c b/src/auth/auth-cache.c
index 1b1192cee28e50b10546aa8fe5353299cb07e98c..6663db642b8732f3fb49cd499f289a23072ec062 100644 (file)
--- a/src/auth/auth-cache.c
+++ b/src/auth/auth-cache.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "lib-signals.h"
 #include "hash.h"
 #include "str.h"

diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c
index f6967072852e12cdca8a0ad0e65b2f69087412fb..88d80d1db641054267800cb497a59511cc652f83 100644 (file)
--- a/src/auth/auth-client-connection.c
+++ b/src/auth/auth-client-connection.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "ioloop.h"
 #include "istream.h"

diff --git a/src/auth/common.h b/src/auth/auth-common.h
similarity index 78%
rename from src/auth/common.h
rename to src/auth/auth-common.h
index 5c74989ea5bb887b2538e93abe71cac62328dfa5..4d0ee6735319fc6d05c1398e1615e1a2469eb9e1 100644 (file)
--- a/src/auth/common.h
+++ b/src/auth/auth-common.h
@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef AUTH_COMMON_H
+#define AUTH_COMMON_H
 
 #include "lib.h"
 #include "auth.h"

diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c
index ee5370450194f76c57dae3115f9ac7af7248eb87..a213dae0151ff29276b31b9f075544ba71ac9855 100644 (file)
--- a/src/auth/auth-master-connection.c
+++ b/src/auth/auth-master-connection.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "hash.h"
 #include "str.h"

diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index 43e19a54b39a3f23d5b4a7cc1d188701dcf4b0be..7e30470a6c70dda6de83f25aa16e1d792a6bef79 100644 (file)
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "array.h"
 #include "aqueue.h"

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 6092c60667b0e75e582c3d01d49771b894cc5794..79eadaff513da30d4230430bc19b877ad800d2b9 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "buffer.h"
 #include "hash.h"

diff --git a/src/auth/auth-stream.c b/src/auth/auth-stream.c
index d9f64b0f63286b97658f2690bd4ebaa409e96863..3140d82283ca6dab686368b9665bcc9544382914 100644 (file)
--- a/src/auth/auth-stream.c
+++ b/src/auth/auth-stream.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "str.h"
 #include "ostream.h"
 #include "auth-request.h"

diff --git a/src/auth/auth-worker-client.c b/src/auth/auth-worker-client.c
index 6ae57d702333dc95754aa78e54660b05b34bb7ee..7df8b388579967fa2bfeceaef7c0a50072c0347a 100644 (file)
--- a/src/auth/auth-worker-client.c
+++ b/src/auth/auth-worker-client.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "base64.h"
 #include "ioloop.h"
 #include "network.h"

diff --git a/src/auth/auth-worker-server.c b/src/auth/auth-worker-server.c
index bd975bf006fb03dbbd2f6e4016d10f94ece472dd..14484d120b90a3ee7a5746256c02314b374d4fbc 100644 (file)
--- a/src/auth/auth-worker-server.c
+++ b/src/auth/auth-worker-server.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "array.h"
 #include "aqueue.h"

diff --git a/src/auth/auth.c b/src/auth/auth.c
index d50d70ba8512b4793c2fb78d4055b99a53eadf13..d60f02012ccb310e7672370cc30751cdb0c09e42 100644 (file)
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "network.h"
 #include "array.h"
 #include "str.h"

diff --git a/src/auth/db-checkpassword.c b/src/auth/db-checkpassword.c
index 37531a5e68471dc0f778029f62c036d1e100c48b..8d330110373196fe8007898739a0cfd750c52319 100644 (file)
--- a/src/auth/db-checkpassword.c
+++ b/src/auth/db-checkpassword.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined(PASSDB_CHECKPASSWORD) || defined(USERDB_CHECKPASSWORD)
 

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 3bb84c1c1fecddb653fdb9f3f6cb57364a5bd086..e0e8941db4e17863582ef9957ae5baa5e66ad8d4 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD)
 

diff --git a/src/auth/db-passwd-file.c b/src/auth/db-passwd-file.c
index 370bc1c5f16eda62496baecadcd2778b48e32013..9d228cfe437a09c8e4c3af40e0c11db7bd2254e4 100644 (file)
--- a/src/auth/db-passwd-file.c
+++ b/src/auth/db-passwd-file.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined (USERDB_PASSWD_FILE) || defined(PASSDB_PASSWD_FILE)
 

diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index 9a378794fb008bf684c0d93eeac35d5395aec49c..3e7cc125f86123dbe2595cf83eb7a96b8f198c38 100644 (file)
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #if defined(PASSDB_SQL) || defined(USERDB_SQL)
 

diff --git a/src/auth/main.c b/src/auth/main.c
index cd6a5c3651ee777bc3433c454b3b3851ce8d84e0..51129380410319525d31407f63154374d4dec70d 100644 (file)
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "ioloop.h"
 #include "network.h"

diff --git a/src/auth/mech-anonymous.c b/src/auth/mech-anonymous.c
index e214064b30e5048ed8be553b3a6b6351f7564f41..ad8c8ec0363b43385bdbba9c4eace8b706613c4a 100644 (file)
--- a/src/auth/mech-anonymous.c
+++ b/src/auth/mech-anonymous.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 
 static void

diff --git a/src/auth/mech-apop.c b/src/auth/mech-apop.c
index 19bf7db2a86ff46d51a0a41a030665a80640cf40..8e2b55965806e1c04be15b36a5a7fb3b61ee8b87 100644 (file)
--- a/src/auth/mech-apop.c
+++ b/src/auth/mech-apop.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "md5.h"

diff --git a/src/auth/mech-cram-md5.c b/src/auth/mech-cram-md5.c
index ca03016277690c3e9471d97ec94ad7d4c2293af4..aa46e33e0063db0805c5b6bb22ff4ba966b0539e 100644 (file)
--- a/src/auth/mech-cram-md5.c
+++ b/src/auth/mech-cram-md5.c
@@ -3,7 +3,7 @@
 /* CRAM-MD5 SASL authentication, see RFC-2195
    Joshua Goodall <joshua@roughtrade.net> */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "buffer.h"
 #include "hex-binary.h"

diff --git a/src/auth/mech-digest-md5.c b/src/auth/mech-digest-md5.c
index 4856561f688d8bcf3f5389815310a45aca6afdef..fc39994cb2e4634c5174694a9241b5255a173165 100644 (file)
--- a/src/auth/mech-digest-md5.c
+++ b/src/auth/mech-digest-md5.c
@@ -2,7 +2,7 @@
 
 /* Digest-MD5 SASL authentication, see RFC-2831 */
 
-#include "common.h"
+#include "auth-common.h"
 #include "base64.h"
 #include "buffer.h"
 #include "hex-binary.h"

diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c
index cd2847f76bc56607c4623a6ca71b0f2ade849ef3..f8bba6edbbc628b86114e58cf14c7ee048145af6 100644 (file)
--- a/src/auth/mech-gssapi.c
+++ b/src/auth/mech-gssapi.c
@@ -12,7 +12,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "env-util.h"
 #include "str.h"
 #include "str-sanitize.h"

diff --git a/src/auth/mech-login.c b/src/auth/mech-login.c
index 16de5d96402b7768ba018e945e8683b36cb5a866..4305a6f3fed68fd9bc2479acd649f61492f14ef1 100644 (file)
--- a/src/auth/mech-login.c
+++ b/src/auth/mech-login.c
@@ -6,11 +6,11 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "safe-memset.h"
-#include "plain-common.h"
+#include "mech-plain-common.h"
 
 
 static void

diff --git a/src/auth/mech-ntlm.c b/src/auth/mech-ntlm.c
index d4c3a4eefbec40f8208b7b80b2712ee9e5ca2d71..02199e835970a335ca9dd60a25649d7a1deeb9a6 100644 (file)
--- a/src/auth/mech-ntlm.c
+++ b/src/auth/mech-ntlm.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "str.h"

diff --git a/src/auth/otp-skey-common.c b/src/auth/mech-otp-skey-common.c
similarity index 95%
rename from src/auth/otp-skey-common.c
rename to src/auth/mech-otp-skey-common.c
index c1c89049e1cdbed89d660c66b22aae95c4452fb5..bbfa0cff610f692820ec99734a45848753d68390 100644 (file)
--- a/src/auth/otp-skey-common.c
+++ b/src/auth/mech-otp-skey-common.c
@@ -6,12 +6,12 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "hash.h"
 #include "mech.h"
 
 #include "otp.h"
-#include "otp-skey-common.h"
+#include "mech-otp-skey-common.h"
 
 static struct hash_table *otp_lock_table;
 

diff --git a/src/auth/otp-skey-common.h b/src/auth/mech-otp-skey-common.h
similarity index 86%
rename from src/auth/otp-skey-common.h
rename to src/auth/mech-otp-skey-common.h
index cffa4b0cb6e54814960040138c3aa2e28375e842..5cefc7559edff49274d4c729038e240449d7457c 100644 (file)
--- a/src/auth/otp-skey-common.h
+++ b/src/auth/mech-otp-skey-common.h
@@ -1,5 +1,5 @@
-#ifndef OTP_SKEY_COMMON_H
-#define OTP_SKEY_COMMON_H
+#ifndef MECH_OTP_SKEY_COMMON_H
+#define MECH_OTP_SKEY_COMMON_H
 
 struct otp_auth_request {
        struct auth_request auth_request;

diff --git a/src/auth/mech-otp.c b/src/auth/mech-otp.c
index 3a960b4d4d84b61f4e1eb6072455e4ca249cb035..8ef5decec1392c469dbd6bb64a5a3d13013cea33 100644 (file)
--- a/src/auth/mech-otp.c
+++ b/src/auth/mech-otp.c
@@ -6,14 +6,14 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#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 "otp-skey-common.h"
+#include "mech-otp-skey-common.h"
 
 static void 
 otp_send_challenge(struct auth_request *auth_request,

diff --git a/src/auth/plain-common.c b/src/auth/mech-plain-common.c
similarity index 86%
rename from src/auth/plain-common.c
rename to src/auth/mech-plain-common.c
index 5830b934afe89f83bb9cfcfa741b143982fd7ff0..143edad85c03292ec5fa6f710634b9e947c8e764 100644 (file)
--- a/src/auth/plain-common.c
+++ b/src/auth/mech-plain-common.c
@@ -1,7 +1,7 @@
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
-#include "plain-common.h"
+#include "mech-plain-common.h"
 
 void plain_verify_callback(enum passdb_result result,
                           struct auth_request *request)

diff --git a/src/auth/plain-common.h b/src/auth/mech-plain-common.h
similarity index 64%
rename from src/auth/plain-common.h
rename to src/auth/mech-plain-common.h
index 4c1b97d64fcb0a1df484429d881a109d8e362310..1dc339c043262b8f78194b8e5bf27edb6305634a 100644 (file)
--- a/src/auth/plain-common.h
+++ b/src/auth/mech-plain-common.h
@@ -1,5 +1,5 @@
-#ifndef PLAIN_COMMON_H
-#define PLAIN_COMMON_H
+#ifndef MECH_PLAIN_COMMON_H
+#define MECH_PLAIN_COMMON_H
 
 void plain_verify_callback(enum passdb_result result,
                           struct auth_request *request);

diff --git a/src/auth/mech-plain.c b/src/auth/mech-plain.c
index eda596ffca766c0a7d8eb62d3e21ec55a2d735f8..82cfe89116a9d1fec4bdb2de928b4bdc3a6108ea 100644 (file)
--- a/src/auth/mech-plain.c
+++ b/src/auth/mech-plain.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "safe-memset.h"
 #include "mech.h"
 #include "passdb.h"
-#include "plain-common.h"
+#include "mech-plain-common.h"
 
 static void
 mech_plain_auth_continue(struct auth_request *request,

diff --git a/src/auth/mech-rpa.c b/src/auth/mech-rpa.c
index 3a9f7142cd98ece0f489dcfeba80dcd9a367fa60..d3a11713956c04029d58e2739bc3674c143149b6 100644 (file)
--- a/src/auth/mech-rpa.c
+++ b/src/auth/mech-rpa.c
@@ -6,7 +6,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "mech.h"
 #include "passdb.h"
 #include "str.h"

diff --git a/src/auth/mech-skey.c b/src/auth/mech-skey.c
index d4c5d19cadfc5cb00325e98ae451f0a8be67b99c..f2bca22411ff33d43905f7320e7ca758dbaf5432 100644 (file)
--- a/src/auth/mech-skey.c
+++ b/src/auth/mech-skey.c
@@ -6,14 +6,14 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#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 "otp-skey-common.h"
+#include "mech-otp-skey-common.h"
 
 static void 
 skey_send_challenge(struct auth_request *auth_request,

diff --git a/src/auth/mech-winbind.c b/src/auth/mech-winbind.c
index e6cbc2dadaa299c571e3bcaf52e7f46cb39bfb32..beb036976b886f5c25d5eff8f14a1acaa5954e46 100644 (file)
--- a/src/auth/mech-winbind.c
+++ b/src/auth/mech-winbind.c
@@ -7,7 +7,7 @@
  * This software is released under the MIT license.
  */
 
-#include "common.h"
+#include "auth-common.h"
 #include "lib-signals.h"
 #include "mech.h"
 #include "str.h"

diff --git a/src/auth/mech.c b/src/auth/mech.c
index d7fe3253711a869d83ebd9f7cd4bb5a01f3f86f1..8d14122e512b3b50a93825e4c8ca52d0ff60b955 100644 (file)
--- a/src/auth/mech.c
+++ b/src/auth/mech.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "ioloop.h"
 #include "mech.h"
 #include "str.h"

diff --git a/src/auth/passdb-blocking.c b/src/auth/passdb-blocking.c
index ac5681b36a79924d160cad63711998ed5e7ae069..08663007af046b35cb40ecabdfafa7b3a80f0d5a 100644 (file)
--- a/src/auth/passdb-blocking.c
+++ b/src/auth/passdb-blocking.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "str.h"
 #include "auth-worker-server.h"
 #include "password-scheme.h"

diff --git a/src/auth/passdb-bsdauth.c b/src/auth/passdb-bsdauth.c
index cd35dac906488fb72cd28901041bf463cbb98140..3985cd16cc21cb6486ba70d6995660283be1c7b0 100644 (file)
--- a/src/auth/passdb-bsdauth.c
+++ b/src/auth/passdb-bsdauth.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_BSDAUTH

diff --git a/src/auth/passdb-cache.c b/src/auth/passdb-cache.c
index a640b5017d46963e8637db85e4ccb3ea9a78385a..ef2366a31bcb56925cc3a846e8c9eb8b65d79e80 100644 (file)
--- a/src/auth/passdb-cache.c
+++ b/src/auth/passdb-cache.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "password-scheme.h"
 #include "passdb.h"
 #include "passdb-cache.h"

diff --git a/src/auth/passdb-checkpassword.c b/src/auth/passdb-checkpassword.c
index 888a2cf977ddc626905875b2f272ff67893c5982..2dfa9642dde360deb774c1624da2cba003bbea72 100644 (file)
--- a/src/auth/passdb-checkpassword.c
+++ b/src/auth/passdb-checkpassword.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_CHECKPASSWORD 

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 60bbd8992dcb8a9ba47ff1c29a9c3a19e863dd66..f3e6302b2fefecb5e1af04e4209422c73443d04a 100644 (file)
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #if defined(PASSDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))

diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c
index ea6b2b39e989aa979fbdb0e342ff287e0eb10bdb..c343e9dcb13560392eeec6e5437a97ab3f07a044 100644 (file)
--- a/src/auth/passdb-pam.c
+++ b/src/auth/passdb-pam.c
@@ -7,7 +7,7 @@
    modified versions are marked as such.  There's absolutely no warranty.
 */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_PAM

diff --git a/src/auth/passdb-passwd-file.c b/src/auth/passdb-passwd-file.c
index 9478cd5b09dba0580a708dc00d3816d95b32132e..0b5bdad3b5b502c7067daffa0299e6098da73e71 100644 (file)
--- a/src/auth/passdb-passwd-file.c
+++ b/src/auth/passdb-passwd-file.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_PASSWD_FILE

diff --git a/src/auth/passdb-passwd.c b/src/auth/passdb-passwd.c
index fee8e56861acbc7e4e511a75a03b4297abfa73cc..3e37bf42b92928bf9f5f1ce600050833e3100488 100644 (file)
--- a/src/auth/passdb-passwd.c
+++ b/src/auth/passdb-passwd.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_PASSWD

diff --git a/src/auth/passdb-shadow.c b/src/auth/passdb-shadow.c
index 96d1b54a3d1841b1e3735551a3857414499e0581..d29acb7a54e93c5915f1aecd53195c45eed8d1be 100644 (file)
--- a/src/auth/passdb-shadow.c
+++ b/src/auth/passdb-shadow.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_SHADOW

diff --git a/src/auth/passdb-sia.c b/src/auth/passdb-sia.c
index a7ebae7146823a3290a7972a629926bd12c8cb74..5d43420f3e895d1606efdd27c1a34a839755ce18 100644 (file)
--- a/src/auth/passdb-sia.c
+++ b/src/auth/passdb-sia.c
@@ -2,7 +2,7 @@
 
 /* Tru64 SIA support */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_SIA

diff --git a/src/auth/passdb-sql.c b/src/auth/passdb-sql.c
index 4ee00d064e3ae979350927b5b8bcbbde9839ff29..d0badbecc928edad8d972797216ef8248cfda9a7 100644 (file)
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_SQL

diff --git a/src/auth/passdb-vpopmail.c b/src/auth/passdb-vpopmail.c
index 292ff3b6acef8ccd9defe0309a424640a513e959..9e234bec0ecab7f3558d897bf1c3abe1e5c0b671 100644 (file)
--- a/src/auth/passdb-vpopmail.c
+++ b/src/auth/passdb-vpopmail.c
@@ -2,7 +2,7 @@
 
 /* Thanks to Courier-IMAP for showing how the vpopmail API should be used */
 
-#include "common.h"
+#include "auth-common.h"
 #include "passdb.h"
 
 #ifdef PASSDB_VPOPMAIL

diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index e7ea725110b175fc9760a47ec089956272db7b43..09f013ca81b60d21d2f4cb13df27a6777b158c65 100644 (file)
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "password-scheme.h"
 #include "auth-worker-server.h"

diff --git a/src/auth/userdb-blocking.c b/src/auth/userdb-blocking.c
index 951168fde63cc1dbf6265a97f58c380556e41a16..f18d116d988ba782b1f669dce1cf1cd3970976ff 100644 (file)
--- a/src/auth/userdb-blocking.c
+++ b/src/auth/userdb-blocking.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "str.h"
 #include "auth-worker-server.h"
 #include "userdb.h"

diff --git a/src/auth/userdb-checkpassword.c b/src/auth/userdb-checkpassword.c
index 6a07a1ea0687a15abb119950a22c5462de21107a..926c795d82d607361af6d091c9174dec90d8e7be 100644 (file)
--- a/src/auth/userdb-checkpassword.c
+++ b/src/auth/userdb-checkpassword.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_CHECKPASSWORD

diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 9c41fde800999075f6bf050aab98b822a7450844..55501a6c493193258e9bad761b333a9764967c47 100644 (file)
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #if defined(USERDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))

diff --git a/src/auth/userdb-nss.c b/src/auth/userdb-nss.c
index 97a93b6055371390ccf644f96606968a65ac023b..00e1dc240f406f80c1da203478b742c08007f16d 100644 (file)
--- a/src/auth/userdb-nss.c
+++ b/src/auth/userdb-nss.c
@@ -2,7 +2,7 @@
 
 /* Currently supports only GLIBC-compatible NSS modules */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_NSS

diff --git a/src/auth/userdb-passwd-file.c b/src/auth/userdb-passwd-file.c
index 2fe4f054285c0d66f95a79a43738692e9585a5a8..60c9cc2f33a8123bf30180ccc0969a9f45bd6b15 100644 (file)
--- a/src/auth/userdb-passwd-file.c
+++ b/src/auth/userdb-passwd-file.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_PASSWD_FILE

diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index ba1a504e3ac630074fc47d8604141e4f6bdef5f5..3eb69bcf7ee8f1fa9236d4809fba1d8ec4d4b3f3 100644 (file)
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_PASSWD

diff --git a/src/auth/userdb-prefetch.c b/src/auth/userdb-prefetch.c
index 5320d14e679a2b8a6e63d6cd1cf5e6986a9544c2..3537014f72d4295090151f28bcb4245df0fdf3de 100644 (file)
--- a/src/auth/userdb-prefetch.c
+++ b/src/auth/userdb-prefetch.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_PREFETCH

diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index 1e2f15aef5a9c8e41b7d17167a6f36bcd79aeb86..ac76bd84c8553eec2bc5bbb76914b247dc010bd6 100644 (file)
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #ifdef USERDB_SQL

diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index 0f3e8d23cad24c9ead1f3ca4982aab0a84192660..dace7119d863979aca1ab629d57aff7760029190 100644 (file)
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 
 #include "array.h"
 #include "str.h"

diff --git a/src/auth/userdb-vpopmail.c b/src/auth/userdb-vpopmail.c
index 5da4f3434143f9ce53027730610f84636b7288ed..efd1b0d61592a45289066ab6a58e29d2a1adca1b 100644 (file)
--- a/src/auth/userdb-vpopmail.c
+++ b/src/auth/userdb-vpopmail.c
@@ -2,7 +2,7 @@
 
 /* Thanks to Courier-IMAP for showing how the vpopmail API should be used */
 
-#include "common.h"
+#include "auth-common.h"
 #include "userdb.h"
 
 #if defined(PASSDB_VPOPMAIL) || defined(USERDB_VPOPMAIL)

diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index 64d13777f8f1cd2b4fafbc7d55914bfe930005ca..ec55a833b4ea1ae3113770dbf60a7f9328a428d0 100644 (file)
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "auth-common.h"
 #include "array.h"
 #include "auth-worker-server.h"
 #include "userdb.h"

diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index a65779a1477569f703fffb739ba431ecb39d7825..5f4d9d9a0bdb17a0e367cfff307dfe269be2c94f 100644 (file)
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -62,9 +62,9 @@ cmds = \
 
 imap_SOURCES = \
        $(cmds) \
-       client.c \
-       commands.c \
-       commands-util.c \
+       imap-client.c \
+       imap-commands.c \
+       imap-commands-util.c \
        imap-expunge.c \
        imap-fetch.c \
        imap-fetch-body.c \
@@ -78,10 +78,10 @@ imap_SOURCES = \
 
 
 headers = \
-       client.h \
-       commands.h \
-       commands-util.h \
-       common.h \
+       imap-client.h \
+       imap-commands.h \
+       imap-commands-util.h \
+       imap-common.h \
        imap-expunge.h \
        imap-fetch.h \
        imap-search.h \

diff --git a/src/imap/cmd-append.c b/src/imap/cmd-append.c
index 2b27608fe13171577563938034ca02baa3360742..51b92800956081f70193b763ed5f82a7374dde67 100644 (file)
--- a/src/imap/cmd-append.c
+++ b/src/imap/cmd-append.c
@@ -1,11 +1,11 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
 #include "str.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-parser.h"
 #include "imap-date.h"
 #include "mail-storage.h"

diff --git a/src/imap/cmd-cancelupdate.c b/src/imap/cmd-cancelupdate.c
index aadbeb7ba0aebaaf77e219b09e935259a53c6278..9b66af50c10376cd4dea3f94e4e458e194bf3213 100644 (file)
--- a/src/imap/cmd-cancelupdate.c
+++ b/src/imap/cmd-cancelupdate.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2008-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 static bool client_search_update_cancel(struct client *client, const char *tag)
 {

diff --git a/src/imap/cmd-capability.c b/src/imap/cmd-capability.c
index 62fed7c2268d1b6bf508800db74fca4a41b12805..782098b077255ccb97fbed0bbad5a9d541b17437 100644 (file)
--- a/src/imap/cmd-capability.c
+++ b/src/imap/cmd-capability.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "str.h"
 
 bool cmd_capability(struct client_command_context *cmd)

diff --git a/src/imap/cmd-check.c b/src/imap/cmd-check.c
index 8da52593f097671c8052a49702a2d559d4437e76..822c36c012894211f3874f91e34338670e2069ad 100644 (file)
--- a/src/imap/cmd-check.c
+++ b/src/imap/cmd-check.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_check(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-close.c b/src/imap/cmd-close.c
index 8b73f3b51adc338b4352eef5a4354bccf6e8641b..4e5dc31067efb387eb8c1045326ba04fc5c48f0a 100644 (file)
--- a/src/imap/cmd-close.c
+++ b/src/imap/cmd-close.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "imap-expunge.h"
 
 bool cmd_close(struct client_command_context *cmd)

diff --git a/src/imap/cmd-copy.c b/src/imap/cmd-copy.c
index 3f0c8f8910fc4c48c6415edd21dc4a74c6f75ceb..d92490795044d3575bea4014ce5cc8f0a27aad2f 100644 (file)
--- a/src/imap/cmd-copy.c
+++ b/src/imap/cmd-copy.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "ostream.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 
 #include <time.h>

diff --git a/src/imap/cmd-create.c b/src/imap/cmd-create.c
index 16ec4b0c2219c6efdd3d2119d2fca637515418c6..c514f5d4f178218532321ef2b18a03ec6d495385 100644 (file)
--- a/src/imap/cmd-create.c
+++ b/src/imap/cmd-create.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 bool cmd_create(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-delete.c b/src/imap/cmd-delete.c
index 43edb6d230d25c4a0ace79fa5df161de22b44139..e4df7ccd433358d0a2efb14b114d71567441ef7b 100644 (file)
--- a/src/imap/cmd-delete.c
+++ b/src/imap/cmd-delete.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_delete(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-enable.c b/src/imap/cmd-enable.c
index acdc7504e57c5b9dcc5e0fa9929be1e9e856ca51..cf062cd37214b43f5b103aa513c4432eda029b5a 100644 (file)
--- a/src/imap/cmd-enable.c
+++ b/src/imap/cmd-enable.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 
 bool cmd_enable(struct client_command_context *cmd)

diff --git a/src/imap/cmd-examine.c b/src/imap/cmd-examine.c
index ab3953662480f86c6077bcec6fcdc7c301bff70c..120d728bf14af332f1cbde5877e546d1d1fc0f00 100644 (file)
--- a/src/imap/cmd-examine.c
+++ b/src/imap/cmd-examine.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_examine(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-expunge.c b/src/imap/cmd-expunge.c
index 8af68b084cc290841f29de02e6ad7b27491a044e..e1c94eb08509861ee9ae720517f1c596cc004fa7 100644 (file)
--- a/src/imap/cmd-expunge.c
+++ b/src/imap/cmd-expunge.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-expunge.h"
 

diff --git a/src/imap/cmd-fetch.c b/src/imap/cmd-fetch.c
index c8a7db0f9dedce5960256420094c78191e58e52c..4d05b40c9594e69382f73b2c02e6840f38ae48cf 100644 (file)
--- a/src/imap/cmd-fetch.c
+++ b/src/imap/cmd-fetch.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-fetch.h"
 #include "imap-search-args.h"
 #include "mail-search.h"

diff --git a/src/imap/cmd-id.c b/src/imap/cmd-id.c
index 3723ba743a49a588e04210a488f425c9814d2f76..e80090d1f33057d52cc9a8292cdd15f1b77055a4 100644 (file)
--- a/src/imap/cmd-id.c
+++ b/src/imap/cmd-id.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "imap-id.h"
 
 bool cmd_id(struct client_command_context *cmd)

diff --git a/src/imap/cmd-idle.c b/src/imap/cmd-idle.c
index f826418daebc89e87b6edaba68be02e8760dc8b8..3e83a8adcc70cfae5886acbcd67beb60ed5ff305 100644 (file)
--- a/src/imap/cmd-idle.c
+++ b/src/imap/cmd-idle.c
@@ -1,11 +1,11 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
 #include "mail-storage-settings.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-sync.h"
 
 #include <stdlib.h>

diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index ff1b5909be5011713423ecd23cf8ffe145c1e9e4..5acef37b7bdfcabb186e6a720368fb8059a0186a 100644 (file)
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -1,13 +1,13 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "str.h"
 #include "strescape.h"
 #include "imap-quote.h"
 #include "imap-match.h"
 #include "imap-status.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-namespace.h"
 
 struct cmd_list_context {

diff --git a/src/imap/cmd-logout.c b/src/imap/cmd-logout.c
index 0eea53ff8b7437b05bfcc1eea9aed87dbad63a31..6a213adaaad1651d5f188ecde3a75ac82053708d 100644 (file)
--- a/src/imap/cmd-logout.c
+++ b/src/imap/cmd-logout.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 bool cmd_logout(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-lsub.c b/src/imap/cmd-lsub.c
index c410b1dc5130385f6659827b7714e99b374f0670..ba36136bed1d09005bb1d9dbb1969381f9d0561c 100644 (file)
--- a/src/imap/cmd-lsub.c
+++ b/src/imap/cmd-lsub.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_lsub(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-namespace.c b/src/imap/cmd-namespace.c
index 5a4ebc9daaccd3ca0a4c83257c61baa50ec63251..2362edc8e6e49cad7a454d9718fc686e9586e461 100644 (file)
--- a/src/imap/cmd-namespace.c
+++ b/src/imap/cmd-namespace.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-namespace.h"
 
 static void list_namespaces(struct mail_namespace *ns,

diff --git a/src/imap/cmd-noop.c b/src/imap/cmd-noop.c
index b9429f9fa14b424aba961eb20f5db8429737b720..31e3ffcbd1a68564793de2f1eaf6cc3704018ded 100644 (file)
--- a/src/imap/cmd-noop.c
+++ b/src/imap/cmd-noop.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_noop(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-rename.c b/src/imap/cmd-rename.c
index dcd4ace03532194cc4507e90630ac6d92e2e8555..bcbbd745ff1c82b653be701eef4ccf43911f2529 100644 (file)
--- a/src/imap/cmd-rename.c
+++ b/src/imap/cmd-rename.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 bool cmd_rename(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-search.c b/src/imap/cmd-search.c
index ce77683f21b8cd65233a523a63557cc396987aba..fc46d814686602e95b92f2f0f80d7d3e6c8b14c1 100644 (file)
--- a/src/imap/cmd-search.c
+++ b/src/imap/cmd-search.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "imap-search-args.h"
 #include "imap-search.h"
 

diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c
index 5e9f1638c8665ac11037d725d04e2c1b6960f61b..d7d0ae5afa044449a51f8ada76010cdd4e6fac9f 100644 (file)
--- a/src/imap/cmd-select.c
+++ b/src/imap/cmd-select.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "seq-range-array.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-search-build.h"
 #include "imap-seqset.h"
 #include "imap-fetch.h"

diff --git a/src/imap/cmd-sort.c b/src/imap/cmd-sort.c
index 43e23a804e7d6beefe9956c7515f30df2e4087ae..47da003e5c80a6801366f6d4c30a9206e42359ac 100644 (file)
--- a/src/imap/cmd-sort.c
+++ b/src/imap/cmd-sort.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "buffer.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-search.h"
 

diff --git a/src/imap/cmd-status.c b/src/imap/cmd-status.c
index 7542bfd37409acc0cca8674eaf32d27a37c6b828..68dad356e4e7fa385e9fe943c8e4f8c426560eb0 100644 (file)
--- a/src/imap/cmd-status.c
+++ b/src/imap/cmd-status.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-sync.h"
 #include "imap-status.h"
 

diff --git a/src/imap/cmd-store.c b/src/imap/cmd-store.c
index e98e768eb755eee572c259cc97e7ec6b17d4e3d4..c021f86b1fd5ef9fa4fd7470599c249bc349350e 100644 (file)
--- a/src/imap/cmd-store.c
+++ b/src/imap/cmd-store.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "seq-range-array.h"
 #include "str.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-util.h"
 

diff --git a/src/imap/cmd-subscribe.c b/src/imap/cmd-subscribe.c
index abbb0e9b29af9e6b76968ac80fc3348457e74d0e..85639092c4b6911417449fe33880e67e04b4ab37 100644 (file)
--- a/src/imap/cmd-subscribe.c
+++ b/src/imap/cmd-subscribe.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 #include "mail-namespace.h"
 
 static bool have_listable_namespace_prefix(struct mail_namespace *ns,

diff --git a/src/imap/cmd-thread.c b/src/imap/cmd-thread.c
index 5a12701855b53c59b7bdde4ce3413662b359104f..aa806094e5ffd3bb9f8824522d2718fbb7a9c48f 100644 (file)
--- a/src/imap/cmd-thread.c
+++ b/src/imap/cmd-thread.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "ostream.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "mail-thread.h"
 

diff --git a/src/imap/cmd-uid.c b/src/imap/cmd-uid.c
index 4d6c004bcbc1ccec1fac6c7099304fd6580b6b1e..21f834669516f5d99f2ca98c8fe89deb9b7b4a2d 100644 (file)
--- a/src/imap/cmd-uid.c
+++ b/src/imap/cmd-uid.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_uid(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-unselect.c b/src/imap/cmd-unselect.c
index f8fc2e7cfc655918cfbe59fbc045d2c983fd8709..fb320494fee2896f6701dc6468951e4cfb5ea218 100644 (file)
--- a/src/imap/cmd-unselect.c
+++ b/src/imap/cmd-unselect.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_unselect(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-unsubscribe.c b/src/imap/cmd-unsubscribe.c
index ef95c4be32d45968535f72df86dc36a26e947721..9872f09299c623dcd717e7c72b51e84d9a4e9348 100644 (file)
--- a/src/imap/cmd-unsubscribe.c
+++ b/src/imap/cmd-unsubscribe.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_unsubscribe(struct client_command_context *cmd)
 {

diff --git a/src/imap/cmd-x-cancel.c b/src/imap/cmd-x-cancel.c
index 5354d3c93fc99ae2de24ba7c518f759a31524fe8..5b0c89212e96245fde9d022c5a43eace6ba3e001 100644 (file)
--- a/src/imap/cmd-x-cancel.c
+++ b/src/imap/cmd-x-cancel.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
-#include "commands.h"
+#include "imap-common.h"
+#include "imap-commands.h"
 
 bool cmd_x_cancel(struct client_command_context *cmd)
 {

diff --git a/src/imap/client.c b/src/imap/imap-client.c
similarity index 99%
rename from src/imap/client.c
rename to src/imap/imap-client.c
index 229d3e9742522319c26551217bc0637e1fbf0661..c7e89b8f6fe57e68ea361cd900eed8a6a9cb03da 100644 (file)
--- a/src/imap/client.c
+++ b/src/imap/imap-client.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "llist.h"
 #include "str.h"
@@ -12,7 +12,7 @@
 #include "imap-resp-code.h"
 #include "imap-util.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/src/imap/client.h b/src/imap/imap-client.h
similarity index 98%
rename from src/imap/client.h
rename to src/imap/imap-client.h
index 289a32b7e76bb9723d1838097c06708a06162252..6a42be8c3ec31fe2041eb9086e4b81b2622b343e 100644 (file)
--- a/src/imap/client.h
+++ b/src/imap/imap-client.h
@@ -1,7 +1,7 @@
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef IMAP_CLIENT_H
+#define IMAP_CLIENT_H
 
-#include "commands.h"
+#include "imap-commands.h"
 
 #define CLIENT_COMMAND_QUEUE_MAX_SIZE 4
 /* Maximum number of CONTEXT=SEARCH UPDATEs. Clients probably won't need more

diff --git a/src/imap/commands-util.c b/src/imap/imap-commands-util.c
similarity index 99%
rename from src/imap/commands-util.c
rename to src/imap/imap-commands-util.c
index c4a9ace5febb4b4718bd486f369c6b30d13c6cc4..8f81e6adfecda9fc5f7662bfdd3baa256ced06fa 100644 (file)
--- a/src/imap/commands-util.c
+++ b/src/imap/imap-commands-util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "buffer.h"
 #include "str.h"
@@ -11,7 +11,7 @@
 #include "imap-util.h"
 #include "mail-storage.h"
 #include "mail-namespace.h"
-#include "commands-util.h"
+#include "imap-commands-util.h"
 
 /* Maximum length for mailbox name, including it's path. This isn't fully
    exact since the user can create folder hierarchy with small names, then

diff --git a/src/imap/commands-util.h b/src/imap/imap-commands-util.h
similarity index 98%
rename from src/imap/commands-util.h
rename to src/imap/imap-commands-util.h
index f29ddbd3fe9d1f5253a77df03481d98fc556608c..d8830eecd84f80a45302aab1b039f353817c38cc 100644 (file)
--- a/src/imap/commands-util.h
+++ b/src/imap/imap-commands-util.h
@@ -1,5 +1,5 @@
-#ifndef COMMANDS_UTIL_H
-#define COMMANDS_UTIL_H
+#ifndef IMAP_COMMANDS_UTIL_H
+#define IMAP_COMMANDS_UTIL_H
 
 struct msgset_generator_context {
        string_t *str;

diff --git a/src/imap/commands.c b/src/imap/imap-commands.c
similarity index 98%
rename from src/imap/commands.c
rename to src/imap/imap-commands.c
index 5e173495e3ce97649be6c82ff77f48131794c017..70855338b0d860d5a472a05f4740e7bbcf3e2fd5 100644 (file)
--- a/src/imap/commands.c
+++ b/src/imap/imap-commands.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "buffer.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 #include <stdlib.h>
 

diff --git a/src/imap/commands.h b/src/imap/imap-commands.h
similarity index 97%
rename from src/imap/commands.h
rename to src/imap/imap-commands.h
index e2fa818e8a779d4b48ea76cb8d55c69ef8df30ad..e53202c09d87d269b216f0a91f14869fdb4cfc10 100644 (file)
--- a/src/imap/commands.h
+++ b/src/imap/imap-commands.h
@@ -1,12 +1,12 @@
-#ifndef COMMANDS_H
-#define COMMANDS_H
+#ifndef IMAP_COMMANDS_H
+#define IMAP_COMMANDS_H
 
 struct client_command_context;
 
 #include "mail-storage.h"
 #include "imap-parser.h"
 #include "imap-sync.h"
-#include "commands-util.h"
+#include "imap-commands-util.h"
 
 typedef bool command_func_t(struct client_command_context *cmd);
 

diff --git a/src/imap/common.h b/src/imap/imap-common.h
similarity index 91%
rename from src/imap/common.h
rename to src/imap/imap-common.h
index 5f0665ead1efc784e300b2e993f4bddbdda66285..d8c0caa73b915ce009df44fb297c008fa6091aec 100644 (file)
--- a/src/imap/common.h
+++ b/src/imap/imap-common.h
@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef IMAP_COMMON_H
+#define IMAP_COMMON_H
 
 /* Disconnect client after idling this many milliseconds */
 #define CLIENT_IDLE_TIMEOUT_MSECS (60*30*1000)
@@ -20,7 +20,7 @@ enum client_workarounds {
 };
 
 #include "lib.h"
-#include "client.h"
+#include "imap-client.h"
 #include "imap-settings.h"
 
 extern struct master_service *service;

diff --git a/src/imap/imap-expunge.c b/src/imap/imap-expunge.c
index 884c0509682088e196609df7b693f7b1acfd7464..e31be4adc8590e552b279b2d5d5b07794f4a0ab8 100644 (file)
--- a/src/imap/imap-expunge.c
+++ b/src/imap/imap-expunge.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-storage.h"
 #include "mail-search-build.h"
 #include "imap-expunge.h"

diff --git a/src/imap/imap-fetch-body.c b/src/imap/imap-fetch-body.c
index 64425406c4e6140544b4925e21e93392326aa59b..d8c8a7aec52b190f66d13949ae6f5fdb41f96251 100644 (file)
--- a/src/imap/imap-fetch-body.c
+++ b/src/imap/imap-fetch-body.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "buffer.h"
 #include "str.h"
 #include "strescape.h"

diff --git a/src/imap/imap-fetch.c b/src/imap/imap-fetch.c
index 29b6e34be846a4cc7a85fe785981ba56e7ba249c..2a3bc10f69886a7700d1d6e34bcaff5ac78617b7 100644 (file)
--- a/src/imap/imap-fetch.c
+++ b/src/imap/imap-fetch.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "array.h"
 #include "buffer.h"
 #include "istream.h"
@@ -10,7 +10,7 @@
 #include "message-size.h"
 #include "imap-date.h"
 #include "mail-search-build.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-quote.h"
 #include "imap-fetch.h"
 #include "imap-util.h"

diff --git a/src/imap/imap-search-args.c b/src/imap/imap-search-args.c
index 21873a21aeab4827705b1840ad36f37485312675..d0fa03354bdd4b74f2ed03a5ab6023b912d70d23 100644 (file)
--- a/src/imap/imap-search-args.c
+++ b/src/imap/imap-search-args.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "mail-storage.h"
 #include "mail-search-build.h"
 #include "imap-search-args.h"

diff --git a/src/imap/imap-search.c b/src/imap/imap-search.c
index f40865fb1ae4c67a55573b7ba60449153af3394e..e0b0e07a6d4b458b6f79d84e930a797b0fb75903 100644 (file)
--- a/src/imap/imap-search.c
+++ b/src/imap/imap-search.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
 #include "str.h"
 #include "seq-range-array.h"
@@ -9,7 +9,7 @@
 #include "imap-seqset.h"
 #include "imap-util.h"
 #include "mail-search-build.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "imap-search-args.h"
 #include "imap-search.h"
 

diff --git a/src/imap/imap-status.c b/src/imap/imap-status.c
index d901167b64c641de31a5fdcac0ae3863a15f1adb..275ead45cde5552994fd5f6cf448ec9aab93edb6 100644 (file)
--- a/src/imap/imap-status.c
+++ b/src/imap/imap-status.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
 #include "imap-status.h"

diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index 35b08294ad3dc1e4547bc9627e7aed8b0d39a164..f6429a28fe5fc6b82da4c23c28aa046d55d1cc59 100644 (file)
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "ostream.h"
 #include "mail-storage.h"
@@ -8,7 +8,7 @@
 #include "imap-quote.h"
 #include "imap-util.h"
 #include "imap-sync.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 struct client_sync_context {
        /* if multiple commands are in progress, we may need to wait for them

diff --git a/src/imap/mail-storage-callbacks.c b/src/imap/mail-storage-callbacks.c
index 427ef8228f4b0db26a63aee6ed6a83e5c0f39a93..62a36b4a608b0cfad050e5ca02f4fc561a2338f9 100644 (file)
--- a/src/imap/mail-storage-callbacks.c
+++ b/src/imap/mail-storage-callbacks.c
@@ -1,9 +1,9 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ostream.h"
 #include "mail-storage.h"
-#include "commands-util.h"
+#include "imap-commands-util.h"
 
 static void notify_ok(struct mailbox *mailbox ATTR_UNUSED,
                      const char *text, void *context)

diff --git a/src/imap/main.c b/src/imap/main.c
index fc39a77e7c2e9959422924ec79721a1c507ae401..60df1238bec51cd786354c9725b82cee1fa6caa8 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
@@ -12,7 +12,7 @@
 #include "master-service.h"
 #include "mail-user.h"
 #include "mail-storage-service.h"
-#include "commands.h"
+#include "imap-commands.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c
index b022c6b699d12bbcd77c9fc78f1a40b742af97d1..1fecb06cd15a3864e5d85032f538315eac1523b2 100644 (file)
--- a/src/plugins/imap-acl/imap-acl-plugin.c
+++ b/src/plugins/imap-acl/imap-acl-plugin.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2008-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
 #include "imap-resp-code.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "mail-storage.h"
 #include "mail-namespace.h"
 #include "acl-api.h"

diff --git a/src/plugins/imap-quota/imap-quota-plugin.c b/src/plugins/imap-quota/imap-quota-plugin.c
index c5e1c280f2287625fb896c29774659a217627905..cb3d9bc9888bfedd35384e81677fefe7c94cc5e6 100644 (file)
--- a/src/plugins/imap-quota/imap-quota-plugin.c
+++ b/src/plugins/imap-quota/imap-quota-plugin.c
@@ -1,10 +1,10 @@
 /* Copyright (c) 2005-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "imap-common.h"
 #include "str.h"
 #include "imap-quote.h"
 #include "mail-namespace.h"
-#include "commands.h"
+#include "imap-commands.h"
 #include "quota.h"
 #include "quota-plugin.h"
 #include "imap-quota-plugin.h"

diff --git a/src/pop3-login/client-authenticate.c b/src/pop3-login/client-authenticate.c
index e1480f1e215e8ed22fbb70cca1b4b7b0ff2af536..13d2e327620ac6d8b79d0128ecd3281c227ed82b 100644 (file)
--- a/src/pop3-login/client-authenticate.c
+++ b/src/pop3-login/client-authenticate.c
@@ -11,7 +11,7 @@
 #include "str.h"
 #include "str-sanitize.h"
 #include "auth-client.h"
-#include "../pop3/capability.h"
+#include "../pop3/pop3-capability.h"
 #include "ssl-proxy.h"
 #include "client.h"
 #include "client-authenticate.h"

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index 6f99e1a8cc0a97150e6b342907c253d8a651aff4..edd195c79420ca7fb10e6d39c8a93277928d370f 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -27,16 +27,16 @@ pop3_LDADD = $(libs) $(MODULE_LIBS)
 pop3_DEPENDENCIES = $(libs)
 
 pop3_SOURCES = \
-       client.c \
-       commands.c \
        main.c \
+       pop3-client.c \
+       pop3-commands.c \
        pop3-settings.c
 
 headers = \
-       capability.h \
-       client.h \
-       commands.h \
-       common.h \
+       pop3-capability.h \
+       pop3-client.h \
+       pop3-commands.h \
+       pop3-common.h \
        pop3-settings.h
 
 if INSTALL_HEADERS

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 8e6b586297096459262bd76fa25d93b74beaf7ba..ef4240b91dd023ec7a3a9cf37752926faa74d546 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "pop3-common.h"
 #include "ioloop.h"
 #include "istream.h"
 #include "buffer.h"

diff --git a/src/pop3/capability.h b/src/pop3/pop3-capability.h
similarity index 100%
rename from src/pop3/capability.h
rename to src/pop3/pop3-capability.h

diff --git a/src/pop3/client.c b/src/pop3/pop3-client.c
similarity index 99%
rename from src/pop3/client.c
rename to src/pop3/pop3-client.c
index 0c3d8df173bdca6101a75f3dd74a2ec3b663d9b1..3e32f52d01f0d61b1a62c23b1ba2a0097b531f55 100644 (file)
--- a/src/pop3/client.c
+++ b/src/pop3/pop3-client.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "pop3-common.h"
 #include "buffer.h"
 #include "ioloop.h"
 #include "network.h"
@@ -10,7 +10,7 @@
 #include "var-expand.h"
 #include "master-service.h"
 #include "mail-storage.h"
-#include "commands.h"
+#include "pop3-commands.h"
 #include "mail-search-build.h"
 #include "mail-namespace.h"
 

diff --git a/src/pop3/client.h b/src/pop3/pop3-client.h
similarity index 97%
rename from src/pop3/client.h
rename to src/pop3/pop3-client.h
index 136fabaf870955d05b15c3915c621dcc84448ed2..a14dcbdacbdd37a5cec2a3ff8dc2a07eac459739 100644 (file)
--- a/src/pop3/client.h
+++ b/src/pop3/pop3-client.h
@@ -1,5 +1,5 @@
-#ifndef CLIENT_H
-#define CLIENT_H
+#ifndef POP3_CLIENT_H
+#define POP3_CLIENT_H
 
 struct client;
 struct mail_storage;

diff --git a/src/pop3/commands.c b/src/pop3/pop3-commands.c
similarity index 99%
rename from src/pop3/commands.c
rename to src/pop3/pop3-commands.c
index dfda430ea7f2754f8881f0d5556ef3386f92496d..e163d0da9728453fb3ebb41c3b109d5334a69b72 100644 (file)
--- a/src/pop3/commands.c
+++ b/src/pop3/pop3-commands.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002-2009 Dovecot authors, see the included COPYING file */
 
-#include "common.h"
+#include "pop3-common.h"
 #include "array.h"
 #include "istream.h"
 #include "ostream.h"
@@ -10,8 +10,8 @@
 #include "mail-storage.h"
 #include "mail-storage-settings.h"
 #include "mail-search-build.h"
-#include "capability.h"
-#include "commands.h"
+#include "pop3-capability.h"
+#include "pop3-commands.h"
 
 static const char *get_msgnum(struct client *client, const char *args,
                              unsigned int *msgnum)

diff --git a/src/pop3/commands.h b/src/pop3/pop3-commands.h
similarity index 68%
rename from src/pop3/commands.h
rename to src/pop3/pop3-commands.h
index b2fed1d2702e7b32b431248fddf872296cdc5aa9..f13c8b0fb366ec778a76ad68cc7dde22acc06542 100644 (file)
--- a/src/pop3/commands.h
+++ b/src/pop3/pop3-commands.h
@@ -1,5 +1,5 @@
-#ifndef COMMANDS_H
-#define COMMANDS_H
+#ifndef POP3_COMMANDS_H
+#define POP3_COMMANDS_H
 
 int client_command_execute(struct client *client,
                           const char *name, const char *args);

diff --git a/src/pop3/common.h b/src/pop3/pop3-common.h
similarity index 83%
rename from src/pop3/common.h
rename to src/pop3/pop3-common.h
index 45cd93f3a441c58f39da0779fe1830efc4d95a04..9f9a764c6feb3bee8674e24c67a65a86667b72eb 100644 (file)
--- a/src/pop3/common.h
+++ b/src/pop3/pop3-common.h
@@ -1,5 +1,5 @@
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef POP3_COMMON_H
+#define POP3_COMMON_H
 
 enum client_workarounds {
        WORKAROUND_OUTLOOK_NO_NULS              = 0x01,
@@ -14,7 +14,7 @@ enum uidl_keys {
 };
 
 #include "lib.h"
-#include "client.h"
+#include "pop3-client.h"
 #include "pop3-settings.h"
 
 extern struct master_service *service;