dovecot-2.0: Renamed headers to prevent collision if they were f...
dovecot at dovecot.org
dovecot at dovecot.org
Tue May 5 19:46:45 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/97cdfeb57129
changeset: 9219:97cdfeb57129
user: Mark Washenberger
date: Tue May 05 11:57:04 2009 -0400
description:
Renamed headers to prevent collision if they were flattened on an install.
diffstat:
134 files changed, 3625 insertions(+), 3625 deletions(-)
src/auth/Makefile.am | 10
src/auth/auth-cache.c | 2
src/auth/auth-client-connection.c | 2
src/auth/auth-common.h | 11
src/auth/auth-master-connection.c | 2
src/auth/auth-request-handler.c | 2
src/auth/auth-request.c | 2
src/auth/auth-stream.c | 2
src/auth/auth-worker-client.c | 2
src/auth/auth-worker-server.c | 2
src/auth/auth.c | 2
src/auth/common.h | 11
src/auth/db-checkpassword.c | 2
src/auth/db-ldap.c | 2
src/auth/db-passwd-file.c | 2
src/auth/db-sql.c | 2
src/auth/main.c | 2
src/auth/mech-anonymous.c | 2
src/auth/mech-apop.c | 2
src/auth/mech-cram-md5.c | 2
src/auth/mech-digest-md5.c | 2
src/auth/mech-gssapi.c | 2
src/auth/mech-login.c | 4
src/auth/mech-ntlm.c | 2
src/auth/mech-otp-skey-common.c | 68 ++
src/auth/mech-otp-skey-common.h | 22
src/auth/mech-otp.c | 4
src/auth/mech-plain-common.c | 20
src/auth/mech-plain-common.h | 7
src/auth/mech-plain.c | 4
src/auth/mech-rpa.c | 2
src/auth/mech-skey.c | 4
src/auth/mech-winbind.c | 2
src/auth/mech.c | 2
src/auth/otp-skey-common.c | 68 --
src/auth/otp-skey-common.h | 22
src/auth/passdb-blocking.c | 2
src/auth/passdb-bsdauth.c | 2
src/auth/passdb-cache.c | 2
src/auth/passdb-checkpassword.c | 2
src/auth/passdb-ldap.c | 2
src/auth/passdb-pam.c | 2
src/auth/passdb-passwd-file.c | 2
src/auth/passdb-passwd.c | 2
src/auth/passdb-shadow.c | 2
src/auth/passdb-sia.c | 2
src/auth/passdb-sql.c | 2
src/auth/passdb-vpopmail.c | 2
src/auth/passdb.c | 2
src/auth/plain-common.c | 20
src/auth/plain-common.h | 7
src/auth/userdb-blocking.c | 2
src/auth/userdb-checkpassword.c | 2
src/auth/userdb-ldap.c | 2
src/auth/userdb-nss.c | 2
src/auth/userdb-passwd-file.c | 2
src/auth/userdb-passwd.c | 2
src/auth/userdb-prefetch.c | 2
src/auth/userdb-sql.c | 2
src/auth/userdb-static.c | 2
src/auth/userdb-vpopmail.c | 2
src/auth/userdb.c | 2
src/imap/Makefile.am | 14
src/imap/client.c | 938 ----------------------------
src/imap/client.h | 200 -----
src/imap/cmd-append.c | 4
src/imap/cmd-cancelupdate.c | 4
src/imap/cmd-capability.c | 4
src/imap/cmd-check.c | 4
src/imap/cmd-close.c | 4
src/imap/cmd-copy.c | 4
src/imap/cmd-create.c | 4
src/imap/cmd-delete.c | 4
src/imap/cmd-enable.c | 2
src/imap/cmd-examine.c | 4
src/imap/cmd-expunge.c | 4
src/imap/cmd-fetch.c | 4
src/imap/cmd-id.c | 2
src/imap/cmd-idle.c | 4
src/imap/cmd-list.c | 4
src/imap/cmd-logout.c | 4
src/imap/cmd-lsub.c | 4
src/imap/cmd-namespace.c | 4
src/imap/cmd-noop.c | 4
src/imap/cmd-rename.c | 4
src/imap/cmd-search.c | 2
src/imap/cmd-select.c | 4
src/imap/cmd-sort.c | 4
src/imap/cmd-status.c | 4
src/imap/cmd-store.c | 4
src/imap/cmd-subscribe.c | 4
src/imap/cmd-thread.c | 4
src/imap/cmd-uid.c | 4
src/imap/cmd-unselect.c | 4
src/imap/cmd-unsubscribe.c | 4
src/imap/cmd-x-cancel.c | 4
src/imap/commands-util.c | 411 ------------
src/imap/commands-util.h | 72 --
src/imap/commands.c | 149 ----
src/imap/commands.h | 103 ---
src/imap/common.h | 30
src/imap/imap-client.c | 938 ++++++++++++++++++++++++++++
src/imap/imap-client.h | 200 +++++
src/imap/imap-commands-util.c | 411 ++++++++++++
src/imap/imap-commands-util.h | 72 ++
src/imap/imap-commands.c | 149 ++++
src/imap/imap-commands.h | 103 +++
src/imap/imap-common.h | 30
src/imap/imap-expunge.c | 2
src/imap/imap-fetch-body.c | 2
src/imap/imap-fetch.c | 4
src/imap/imap-search-args.c | 2
src/imap/imap-search.c | 4
src/imap/imap-status.c | 2
src/imap/imap-sync.c | 4
src/imap/mail-storage-callbacks.c | 4
src/imap/main.c | 4
src/plugins/imap-acl/imap-acl-plugin.c | 4
src/plugins/imap-quota/imap-quota-plugin.c | 4
src/pop3-login/client-authenticate.c | 2
src/pop3/Makefile.am | 12
src/pop3/capability.h | 13
src/pop3/client.c | 586 -----------------
src/pop3/client.h | 81 --
src/pop3/commands.c | 731 ---------------------
src/pop3/commands.h | 7
src/pop3/common.h | 24
src/pop3/main.c | 2
src/pop3/pop3-capability.h | 13
src/pop3/pop3-client.c | 586 +++++++++++++++++
src/pop3/pop3-client.h | 81 ++
src/pop3/pop3-commands.c | 731 +++++++++++++++++++++
src/pop3/pop3-commands.h | 7
src/pop3/pop3-common.h | 24
diffs (truncated from 8417 to 300 lines):
diff -r 4a42f694b762 -r 97cdfeb57129 src/auth/Makefile.am
--- a/src/auth/Makefile.am Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/Makefile.am Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-cache.c
--- a/src/auth/auth-cache.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-cache.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-client-connection.c
--- a/src/auth/auth-client-connection.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-client-connection.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-common.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/auth/auth-common.h Tue May 05 11:57:04 2009 -0400
@@ -0,0 +1,11 @@
+#ifndef AUTH_COMMON_H
+#define AUTH_COMMON_H
+
+#include "lib.h"
+#include "auth.h"
+
+extern struct master_service *service;
+extern bool worker, shutdown_request;
+extern time_t process_start_time;
+
+#endif
diff -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-master-connection.c
--- a/src/auth/auth-master-connection.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-master-connection.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-request-handler.c
--- a/src/auth/auth-request-handler.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-request-handler.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-request.c
--- a/src/auth/auth-request.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-request.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-stream.c
--- a/src/auth/auth-stream.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-stream.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-worker-client.c
--- a/src/auth/auth-worker-client.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-worker-client.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth-worker-server.c
--- a/src/auth/auth-worker-server.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth-worker-server.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/auth.c
--- a/src/auth/auth.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/auth.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/common.h
--- a/src/auth/common.h Mon May 04 20:50:13 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#ifndef COMMON_H
-#define COMMON_H
-
-#include "lib.h"
-#include "auth.h"
-
-extern struct master_service *service;
-extern bool worker, shutdown_request;
-extern time_t process_start_time;
-
-#endif
diff -r 4a42f694b762 -r 97cdfeb57129 src/auth/db-checkpassword.c
--- a/src/auth/db-checkpassword.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/db-checkpassword.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/db-ldap.c
--- a/src/auth/db-ldap.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/db-ldap.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/db-passwd-file.c
--- a/src/auth/db-passwd-file.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/db-passwd-file.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/db-sql.c
--- a/src/auth/db-sql.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/db-sql.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/main.c
--- a/src/auth/main.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/main.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/mech-anonymous.c
--- a/src/auth/mech-anonymous.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/mech-anonymous.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/mech-apop.c
--- a/src/auth/mech-apop.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/mech-apop.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/mech-cram-md5.c
--- a/src/auth/mech-cram-md5.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/mech-cram-md5.c Tue May 05 11:57:04 2009 -0400
@@ -3,7 +3,7 @@
/* CRAM-MD5 SASL authentication, see RFC-2195
Joshua Goodall <joshua at roughtrade.net> */
-#include "common.h"
+#include "auth-common.h"
#include "ioloop.h"
#include "buffer.h"
#include "hex-binary.h"
diff -r 4a42f694b762 -r 97cdfeb57129 src/auth/mech-digest-md5.c
--- a/src/auth/mech-digest-md5.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/mech-digest-md5.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/mech-gssapi.c
--- a/src/auth/mech-gssapi.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/mech-gssapi.c Tue May 05 11:57:04 2009 -0400
@@ -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 -r 4a42f694b762 -r 97cdfeb57129 src/auth/mech-login.c
--- a/src/auth/mech-login.c Mon May 04 20:50:13 2009 -0400
+++ b/src/auth/mech-login.c Tue May 05 11:57:04 2009 -0400
@@ -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"
More information about the dovecot-cvs
mailing list