From: Timo Sirainen Date: Wed, 3 Oct 2012 15:17:26 +0000 (+0300) Subject: Renamed network.[ch] to net.[ch]. X-Git-Tag: 2.2.alpha1~113 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdd36cfdba3ff66d25570a9ff568d69e1eb543cf;p=thirdparty%2Fdovecot%2Fcore.git Renamed network.[ch] to net.[ch]. The function prefixes already started with net_ instead of network_. And icecap wants to use network.h for other purpose. :) --- diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c index 138ae6f33b..cfba0e76bc 100644 --- a/src/auth/auth-client-connection.c +++ b/src/auth/auth-client-connection.c @@ -4,7 +4,7 @@ #include "ioloop.h" #include "istream.h" #include "ostream.h" -#include "network.h" +#include "net.h" #include "hex-binary.h" #include "hostpid.h" #include "llist.h" diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c index ec411321cf..4b9e3fb770 100644 --- a/src/auth/auth-master-connection.c +++ b/src/auth/auth-master-connection.c @@ -10,7 +10,7 @@ #include "hostpid.h" #include "hex-binary.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "ipwd.h" diff --git a/src/auth/auth-penalty.c b/src/auth/auth-penalty.c index 35143f5a43..72cc9f8956 100644 --- a/src/auth/auth-penalty.c +++ b/src/auth/auth-penalty.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "crc32.h" #include "master-service.h" #include "anvil-client.h" diff --git a/src/auth/auth-postfix-connection.c b/src/auth/auth-postfix-connection.c index b16e70c935..e5ddd3fdfd 100644 --- a/src/auth/auth-postfix-connection.c +++ b/src/auth/auth-postfix-connection.c @@ -2,7 +2,7 @@ #include "auth-common.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "llist.h" diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c index df3f859488..845da75eb7 100644 --- a/src/auth/auth-request-handler.c +++ b/src/auth/auth-request-handler.c @@ -6,7 +6,7 @@ #include "aqueue.h" #include "base64.h" #include "hash.h" -#include "network.h" +#include "net.h" #include "str.h" #include "str-sanitize.h" #include "master-interface.h" diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h index 673c8d70f5..8ec1c31a6f 100644 --- a/src/auth/auth-request.h +++ b/src/auth/auth-request.h @@ -1,7 +1,7 @@ #ifndef AUTH_REQUEST_H #define AUTH_REQUEST_H -#include "network.h" +#include "net.h" #include "var-expand.h" #include "mech.h" #include "userdb.h" diff --git a/src/auth/auth-worker-client.c b/src/auth/auth-worker-client.c index b18722b24c..db943ee1a6 100644 --- a/src/auth/auth-worker-client.c +++ b/src/auth/auth-worker-client.c @@ -3,7 +3,7 @@ #include "auth-common.h" #include "base64.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "hex-binary.h" diff --git a/src/auth/auth-worker-server.c b/src/auth/auth-worker-server.c index 6dedbc3343..031011f969 100644 --- a/src/auth/auth-worker-server.c +++ b/src/auth/auth-worker-server.c @@ -4,7 +4,7 @@ #include "ioloop.h" #include "array.h" #include "aqueue.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "hex-binary.h" diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c index c520a1652a..cc79d0e2be 100644 --- a/src/auth/db-ldap.c +++ b/src/auth/db-ldap.c @@ -4,7 +4,7 @@ #if defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD) -#include "network.h" +#include "net.h" #include "ioloop.h" #include "array.h" #include "hash.h" diff --git a/src/auth/main.c b/src/auth/main.c index 02168f246f..78aad25f12 100644 --- a/src/auth/main.c +++ b/src/auth/main.c @@ -3,7 +3,7 @@ #include "auth-common.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "lib-signals.h" #include "restrict-access.h" #include "child-wait.h" diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c index b5de21247e..0b0ff1c0b4 100644 --- a/src/auth/passdb-pam.c +++ b/src/auth/passdb-pam.c @@ -15,7 +15,7 @@ #include "lib-signals.h" #include "str.h" #include "var-expand.h" -#include "network.h" +#include "net.h" #include "safe-memset.h" #include "auth-cache.h" diff --git a/src/config/config-filter.h b/src/config/config-filter.h index 08bef22a6d..7e45fc1a77 100644 --- a/src/config/config-filter.h +++ b/src/config/config-filter.h @@ -1,7 +1,7 @@ #ifndef CONFIG_FILTER_H #define CONFIG_FILTER_H -#include "network.h" +#include "net.h" struct master_service_settings_output; diff --git a/src/config/settings-get.pl b/src/config/settings-get.pl index f31ff46485..9acce75517 100755 --- a/src/config/settings-get.pl +++ b/src/config/settings-get.pl @@ -8,7 +8,7 @@ print '#include "var-expand.h"'."\n"; print '#include "file-lock.h"'."\n"; print '#include "fsync-mode.h"'."\n"; print '#include "hash-format.h"'."\n"; -print '#include "network.h"'."\n"; +print '#include "net.h"'."\n"; print '#include "unichar.h"'."\n"; print '#include "settings-parser.h"'."\n"; print '#include "all-settings.h"'."\n"; diff --git a/src/director/auth-connection.c b/src/director/auth-connection.c index b3584bc913..40c0f54a50 100644 --- a/src/director/auth-connection.c +++ b/src/director/auth-connection.c @@ -4,7 +4,7 @@ #include "ioloop.h" #include "istream.h" #include "ostream.h" -#include "network.h" +#include "net.h" #include "llist.h" #include "safe-memset.h" #include "auth-client-interface.h" diff --git a/src/director/director-connection.c b/src/director/director-connection.c index e2b13e1977..2299eca823 100644 --- a/src/director/director-connection.c +++ b/src/director/director-connection.c @@ -31,7 +31,7 @@ #include "lib.h" #include "ioloop.h" #include "array.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "str.h" diff --git a/src/director/director-host.h b/src/director/director-host.h index e3879ee030..b402375fc0 100644 --- a/src/director/director-host.h +++ b/src/director/director-host.h @@ -1,7 +1,7 @@ #ifndef DIRECTOR_HOST_H #define DIRECTOR_HOST_H -#include "network.h" +#include "net.h" struct director; diff --git a/src/director/director.h b/src/director/director.h index a020a4ef51..4f1cd63bdf 100644 --- a/src/director/director.h +++ b/src/director/director.h @@ -1,7 +1,7 @@ #ifndef DIRECTOR_H #define DIRECTOR_H -#include "network.h" +#include "net.h" #include "director-settings.h" #define DIRECTOR_VERSION_NAME "director" diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c index 459e667ed3..eb5eee8bf4 100644 --- a/src/director/doveadm-connection.c +++ b/src/director/doveadm-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "array.h" diff --git a/src/director/login-connection.c b/src/director/login-connection.c index c9aa183f34..6cacb582a4 100644 --- a/src/director/login-connection.c +++ b/src/director/login-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "ostream.h" #include "llist.h" #include "master-service.h" diff --git a/src/director/mail-host.h b/src/director/mail-host.h index 073cb7493e..4a6cc78b77 100644 --- a/src/director/mail-host.h +++ b/src/director/mail-host.h @@ -1,7 +1,7 @@ #ifndef MAIL_HOST_H #define MAIL_HOST_H -#include "network.h" +#include "net.h" struct mail_host_list; diff --git a/src/doveadm/doveadm-director.c b/src/doveadm/doveadm-director.c index 305099256f..1ed8257655 100644 --- a/src/doveadm/doveadm-director.c +++ b/src/doveadm/doveadm-director.c @@ -4,7 +4,7 @@ #include "md5.h" #include "hash.h" #include "str.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "write-full.h" #include "master-service.h" diff --git a/src/doveadm/doveadm-kick.c b/src/doveadm/doveadm-kick.c index 0bfa2d4fa6..e49042bb87 100644 --- a/src/doveadm/doveadm-kick.c +++ b/src/doveadm/doveadm-kick.c @@ -2,7 +2,7 @@ #include "lib.h" #include "array.h" -#include "network.h" +#include "net.h" #include "hash.h" #include "doveadm.h" #include "doveadm-who.h" diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c index 63c62e60f4..5a7f727aea 100644 --- a/src/doveadm/doveadm-mail-index.c +++ b/src/doveadm/doveadm-mail-index.c @@ -3,7 +3,7 @@ #include "lib.h" #include "str.h" #include "strescape.h" -#include "network.h" +#include "net.h" #include "write-full.h" #include "mail-namespace.h" #include "mail-storage.h" diff --git a/src/doveadm/doveadm-penalty.c b/src/doveadm/doveadm-penalty.c index 4bf67ea16a..7a0dd9d4bf 100644 --- a/src/doveadm/doveadm-penalty.c +++ b/src/doveadm/doveadm-penalty.c @@ -2,7 +2,7 @@ #include "lib.h" #include "array.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "hash.h" #include "doveadm.h" diff --git a/src/doveadm/doveadm-stats.c b/src/doveadm/doveadm-stats.c index eda9240ad7..af1c92ce50 100644 --- a/src/doveadm/doveadm-stats.c +++ b/src/doveadm/doveadm-stats.c @@ -2,7 +2,7 @@ #include "lib.h" #include "array.h" -#include "network.h" +#include "net.h" #include "ioloop.h" #include "istream.h" #include "hash.h" diff --git a/src/doveadm/doveadm-util.c b/src/doveadm/doveadm-util.c index a83a26e6c0..5ead346c7a 100644 --- a/src/doveadm/doveadm-util.c +++ b/src/doveadm/doveadm-util.c @@ -2,7 +2,7 @@ #include "lib.h" #include "array.h" -#include "network.h" +#include "net.h" #include "time-util.h" #include "master-service.h" #include "module-dir.h" diff --git a/src/doveadm/doveadm-who.c b/src/doveadm/doveadm-who.c index de0c32ffcb..aa1bc66b67 100644 --- a/src/doveadm/doveadm-who.c +++ b/src/doveadm/doveadm-who.c @@ -2,7 +2,7 @@ #include "lib.h" #include "array.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "wildcard-match.h" #include "hash.h" diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c index 1b31a53b4a..f8adbf57a4 100644 --- a/src/doveadm/server-connection.c +++ b/src/doveadm/server-connection.c @@ -4,7 +4,7 @@ #include "array.h" #include "base64.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "str.h" diff --git a/src/imap-login/client-authenticate.c b/src/imap-login/client-authenticate.c index dac6e736b9..ae31ca49a0 100644 --- a/src/imap-login/client-authenticate.c +++ b/src/imap-login/client-authenticate.c @@ -9,7 +9,7 @@ #include "safe-memset.h" #include "str.h" #include "str-sanitize.h" -#include "network.h" +#include "net.h" #include "imap-resp-code.h" #include "imap-parser.h" #include "imap-url.h" diff --git a/src/imap-login/client.h b/src/imap-login/client.h index 93d6c0b87c..555d7b77d4 100644 --- a/src/imap-login/client.h +++ b/src/imap-login/client.h @@ -1,7 +1,7 @@ #ifndef CLIENT_H #define CLIENT_H -#include "network.h" +#include "net.h" #include "client-common.h" /* Master prefix is: <1|0> */ diff --git a/src/imap-urlauth/imap-urlauth-client.c b/src/imap-urlauth/imap-urlauth-client.c index 6c1a007e54..e49a620980 100644 --- a/src/imap-urlauth/imap-urlauth-client.c +++ b/src/imap-urlauth/imap-urlauth-client.c @@ -3,7 +3,7 @@ #include "imap-urlauth-common.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "fdpass.h" #include "istream.h" #include "ostream.h" diff --git a/src/imap-urlauth/imap-urlauth-login.c b/src/imap-urlauth/imap-urlauth-login.c index ee872163fb..8204a12bad 100644 --- a/src/imap-urlauth/imap-urlauth-login.c +++ b/src/imap-urlauth/imap-urlauth-login.c @@ -4,7 +4,7 @@ #include "str.h" #include "strescape.h" #include "base64.h" -#include "network.h" +#include "net.h" #include "ioloop.h" #include "istream.h" #include "ostream.h" diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c index b5240bcfaa..042c417831 100644 --- a/src/imap-urlauth/imap-urlauth-worker.c +++ b/src/imap-urlauth/imap-urlauth-worker.c @@ -3,7 +3,7 @@ #include "lib.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "fdpass.h" #include "istream.h" #include "ostream.h" diff --git a/src/imap/cmd-idle.c b/src/imap/cmd-idle.c index 45a2da75af..dc19536a62 100644 --- a/src/imap/cmd-idle.c +++ b/src/imap/cmd-idle.c @@ -1,7 +1,7 @@ /* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */ #include "imap-common.h" -#include "network.h" +#include "net.h" #include "ioloop.h" #include "istream.h" #include "ostream.h" diff --git a/src/imap/cmd-urlfetch.c b/src/imap/cmd-urlfetch.c index fcfd4b8ae5..eb02728feb 100644 --- a/src/imap/cmd-urlfetch.c +++ b/src/imap/cmd-urlfetch.c @@ -4,7 +4,7 @@ #include "strfuncs.h" #include "str.h" #include "array.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "imap-url.h" diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c index 91170f514b..0bd93bf70d 100644 --- a/src/imap/imap-client.c +++ b/src/imap/imap-client.c @@ -5,7 +5,7 @@ #include "llist.h" #include "str.h" #include "hostpid.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "time-util.h" diff --git a/src/lib-auth/auth-client.h b/src/lib-auth/auth-client.h index 4434f6b3f0..77a98d70d9 100644 --- a/src/lib-auth/auth-client.h +++ b/src/lib-auth/auth-client.h @@ -1,7 +1,7 @@ #ifndef AUTH_CLIENT_H #define AUTH_CLIENT_H -#include "network.h" +#include "net.h" #include "auth-client-interface.h" struct auth_client; diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c index 6cd11f834a..978b96f9bb 100644 --- a/src/lib-auth/auth-master.c +++ b/src/lib-auth/auth-master.c @@ -5,7 +5,7 @@ #include "array.h" #include "ioloop.h" #include "eacces-error.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "str.h" diff --git a/src/lib-auth/auth-master.h b/src/lib-auth/auth-master.h index ccaabf4e45..3e51192ed1 100644 --- a/src/lib-auth/auth-master.h +++ b/src/lib-auth/auth-master.h @@ -1,7 +1,7 @@ #ifndef AUTH_MASTER_H #define AUTH_MASTER_H -#include "network.h" +#include "net.h" enum auth_master_flags { /* Enable logging debug information */ diff --git a/src/lib-auth/auth-server-connection.c b/src/lib-auth/auth-server-connection.c index 2f69380eee..ed199dfde8 100644 --- a/src/lib-auth/auth-server-connection.c +++ b/src/lib-auth/auth-server-connection.c @@ -7,7 +7,7 @@ #include "ioloop.h" #include "istream.h" #include "ostream.h" -#include "network.h" +#include "net.h" #include "eacces-error.h" #include "auth-client-private.h" #include "auth-client-request.h" diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c index 6e2f85eb1b..bf263e7442 100644 --- a/src/lib-dict/dict-client.c +++ b/src/lib-dict/dict-client.c @@ -3,7 +3,7 @@ #include "lib.h" #include "llist.h" #include "str.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "eacces-error.h" diff --git a/src/lib-dns/dns-lookup.c b/src/lib-dns/dns-lookup.c index ac50212462..7b1952f040 100644 --- a/src/lib-dns/dns-lookup.c +++ b/src/lib-dns/dns-lookup.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "write-full.h" #include "time-util.h" diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c index f74d6dd07e..65865e1d4c 100644 --- a/src/lib-imap-client/imapc-connection.c +++ b/src/lib-imap-client/imapc-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "base64.h" diff --git a/src/lib-imap-storage/imap-msgpart-url.c b/src/lib-imap-storage/imap-msgpart-url.c index 3986df595a..f4a9d54564 100644 --- a/src/lib-imap-storage/imap-msgpart-url.c +++ b/src/lib-imap-storage/imap-msgpart-url.c @@ -1,7 +1,7 @@ /* Copyright (c) 2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "message-parser.h" #include "mail-storage.h" diff --git a/src/lib-imap-urlauth/imap-urlauth-connection.c b/src/lib-imap-urlauth/imap-urlauth-connection.c index d9b8e8fa7f..ee3a3d972b 100644 --- a/src/lib-imap-urlauth/imap-urlauth-connection.c +++ b/src/lib-imap-urlauth/imap-urlauth-connection.c @@ -8,7 +8,7 @@ #include "ioloop.h" #include "safe-mkstemp.h" #include "hostpid.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "write-full.h" diff --git a/src/lib-imap-urlauth/imap-urlauth-fetch.c b/src/lib-imap-urlauth/imap-urlauth-fetch.c index 23707f5da0..a4fdd7e4c9 100644 --- a/src/lib-imap-urlauth/imap-urlauth-fetch.c +++ b/src/lib-imap-urlauth/imap-urlauth-fetch.c @@ -3,7 +3,7 @@ #include "lib.h" #include "llist.h" #include "array.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "mail-user.h" #include "mail-error.h" diff --git a/src/lib-imap/imap-url.c b/src/lib-imap/imap-url.c index 0e8e5f62e2..9c179202a5 100644 --- a/src/lib-imap/imap-url.c +++ b/src/lib-imap/imap-url.c @@ -6,7 +6,7 @@ #include "strfuncs.h" #include "str-sanitize.h" #include "hex-binary.h" -#include "network.h" +#include "net.h" #include "iso8601-date.h" #include "uri-util.h" diff --git a/src/lib-imap/test-imap-url.c b/src/lib-imap/test-imap-url.c index 5475171c15..9588cf0a4c 100644 --- a/src/lib-imap/test-imap-url.c +++ b/src/lib-imap/test-imap-url.c @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2011 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "imap-url.h" #include "test-common.h" diff --git a/src/lib-lda/lmtp-client.c b/src/lib-lda/lmtp-client.c index e845b267db..8523603c85 100644 --- a/src/lib-lda/lmtp-client.c +++ b/src/lib-lda/lmtp-client.c @@ -3,7 +3,7 @@ #include "lib.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "str.h" diff --git a/src/lib-lda/lmtp-client.h b/src/lib-lda/lmtp-client.h index 6aa0c203c2..48b17069a2 100644 --- a/src/lib-lda/lmtp-client.h +++ b/src/lib-lda/lmtp-client.h @@ -1,7 +1,7 @@ #ifndef LMTP_CLIENT_H #define LMTP_CLIENT_H -#include "network.h" +#include "net.h" #define ERRSTR_TEMP_REMOTE_FAILURE "451 4.4.0 Remote server not answering" diff --git a/src/lib-master/anvil-client.c b/src/lib-master/anvil-client.c index acbb1c2e41..d7e0811ea4 100644 --- a/src/lib-master/anvil-client.c +++ b/src/lib-master/anvil-client.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "array.h" diff --git a/src/lib-master/ipc-client.c b/src/lib-master/ipc-client.c index eda8dd994f..e12f73c215 100644 --- a/src/lib-master/ipc-client.c +++ b/src/lib-master/ipc-client.c @@ -3,7 +3,7 @@ #include "lib.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "hostpid.h" diff --git a/src/lib-master/ipc-server.c b/src/lib-master/ipc-server.c index 68cfc28ace..c5d6daf822 100644 --- a/src/lib-master/ipc-server.c +++ b/src/lib-master/ipc-server.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "hostpid.h" diff --git a/src/lib-master/master-auth.h b/src/lib-master/master-auth.h index 72f3dccd99..1f3f678b1b 100644 --- a/src/lib-master/master-auth.h +++ b/src/lib-master/master-auth.h @@ -1,7 +1,7 @@ #ifndef MASTER_AUTH_H #define MASTER_AUTH_H -#include "network.h" +#include "net.h" struct master_service; diff --git a/src/lib-master/master-login-auth.c b/src/lib-master/master-login-auth.c index 4335efcaee..bed7b08f0d 100644 --- a/src/lib-master/master-login-auth.c +++ b/src/lib-master/master-login-auth.c @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "ioloop.h" #include "hostpid.h" #include "istream.h" diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h index 678daabec9..5566a96919 100644 --- a/src/lib-master/master-service-settings.h +++ b/src/lib-master/master-service-settings.h @@ -1,7 +1,7 @@ #ifndef MASTER_SERVICE_SETTINGS_H #define MASTER_SERVICE_SETTINGS_H -#include "network.h" +#include "net.h" struct setting_parser_info; struct setting_parser_context; diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h index 1b996fa87d..37b38e9dd8 100644 --- a/src/lib-master/master-service.h +++ b/src/lib-master/master-service.h @@ -1,7 +1,7 @@ #ifndef MASTER_SERVICE_H #define MASTER_SERVICE_H -#include "network.h" +#include "net.h" enum master_service_flags { /* stdin/stdout already contains a client which we want to serve */ diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c index d1a534f45d..53712acde4 100644 --- a/src/lib-settings/settings-parser.c +++ b/src/lib-settings/settings-parser.c @@ -3,7 +3,7 @@ #include "lib.h" #include "array.h" #include "hash.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "env-util.h" #include "execv-const.h" diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c index d9ba49640e..51769b677c 100644 --- a/src/lib-storage/index/pop3c/pop3c-client.c +++ b/src/lib-storage/index/pop3c/pop3c-client.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "istream-dot.h" #include "istream-seekable.h" diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h index 4cbdd66588..077065b1ee 100644 --- a/src/lib-storage/mail-storage-service.h +++ b/src/lib-storage/mail-storage-service.h @@ -1,7 +1,7 @@ #ifndef MAIL_STORAGE_SERVICE_H #define MAIL_STORAGE_SERVICE_H -#include "network.h" +#include "net.h" struct master_service; struct mail_user; diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c index dbb23ce233..66dc8ed288 100644 --- a/src/lib-storage/mail-user.c +++ b/src/lib-storage/mail-user.c @@ -3,7 +3,7 @@ #include "lib.h" #include "array.h" #include "hostpid.h" -#include "network.h" +#include "net.h" #include "module-dir.h" #include "home-expand.h" #include "safe-mkstemp.h" diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index bde15ed137..5b4977e088 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -93,7 +93,7 @@ liblib_la_SOURCES = \ mmap-util.c \ module-dir.c \ mountpoint.c \ - network.c \ + net.c \ nfs-workarounds.c \ numpack.c \ ostream.c \ @@ -207,7 +207,7 @@ headers = \ module-context.h \ module-dir.h \ mountpoint.h \ - network.h \ + net.h \ nfs-workarounds.h \ numpack.h \ ostream.h \ diff --git a/src/lib/connection.c b/src/lib/connection.c index 7000442c0b..35b94642d6 100644 --- a/src/lib/connection.c +++ b/src/lib/connection.c @@ -4,7 +4,7 @@ #include "ioloop.h" #include "istream.h" #include "ostream.h" -#include "network.h" +#include "net.h" #include "strescape.h" #include "llist.h" #include "connection.h" diff --git a/src/lib/connection.h b/src/lib/connection.h index d3361807c3..0051c02a87 100644 --- a/src/lib/connection.h +++ b/src/lib/connection.h @@ -1,7 +1,7 @@ #ifndef CONNECTION_H #define CONNECTION_H -#include "network.h" +#include "net.h" struct connection; diff --git a/src/lib/failures.c b/src/lib/failures.c index c6903b5119..f52fff72d8 100644 --- a/src/lib/failures.c +++ b/src/lib/failures.c @@ -4,7 +4,7 @@ #include "ioloop.h" #include "str.h" #include "hostpid.h" -#include "network.h" +#include "net.h" #include "lib-signals.h" #include "backtrace-string.h" #include "printf-format-fix.h" diff --git a/src/lib/fd-close-on-exec.c b/src/lib/fd-close-on-exec.c index 3aca383595..ac1487d9cb 100644 --- a/src/lib/fd-close-on-exec.c +++ b/src/lib/fd-close-on-exec.c @@ -1,7 +1,7 @@ /* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "fd-close-on-exec.h" #include diff --git a/src/lib/ioloop-notify-inotify.c b/src/lib/ioloop-notify-inotify.c index 76b81766ef..9e59f2f375 100644 --- a/src/lib/ioloop-notify-inotify.c +++ b/src/lib/ioloop-notify-inotify.c @@ -10,7 +10,7 @@ #include "ioloop-private.h" #include "ioloop-notify-fd.h" #include "buffer.h" -#include "network.h" +#include "net.h" #include "ipwd.h" #include diff --git a/src/lib/istream-file.c b/src/lib/istream-file.c index dd52104da4..5858124a27 100644 --- a/src/lib/istream-file.c +++ b/src/lib/istream-file.c @@ -5,7 +5,7 @@ #include "lib.h" #include "ioloop.h" #include "istream-private.h" -#include "network.h" +#include "net.h" #include #include diff --git a/src/lib/network.c b/src/lib/net.c similarity index 99% rename from src/lib/network.c rename to src/lib/net.c index 4db754e3c1..34045ebf68 100644 --- a/src/lib/network.c +++ b/src/lib/net.c @@ -4,7 +4,7 @@ #include "lib.h" #include "fd-set-nonblock.h" #include "time-util.h" -#include "network.h" +#include "net.h" #include #include diff --git a/src/lib/network.h b/src/lib/net.h similarity index 99% rename from src/lib/network.h rename to src/lib/net.h index d8dde534b9..9631a38a8f 100644 --- a/src/lib/network.h +++ b/src/lib/net.h @@ -1,5 +1,5 @@ -#ifndef NETWORK_H -#define NETWORK_H +#ifndef NET_H +#define NET_H #ifndef WIN32 # include diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c index 76a021b717..85431fa7ac 100644 --- a/src/lib/ostream-file.c +++ b/src/lib/ostream-file.c @@ -5,7 +5,7 @@ #include "lib.h" #include "ioloop.h" #include "write-full.h" -#include "network.h" +#include "net.h" #include "sendfile-util.h" #include "istream.h" #include "istream-private.h" diff --git a/src/lib/sendfile-util.c b/src/lib/sendfile-util.c index e65c36801c..8c46e75fa4 100644 --- a/src/lib/sendfile-util.c +++ b/src/lib/sendfile-util.c @@ -93,7 +93,7 @@ ssize_t safe_sendfile(int out_fd, int in_fd, uoff_t *offset, size_t count) #elif defined (HAVE_SOLARIS_SENDFILE) #include -#include "network.h" +#include "net.h" ssize_t safe_sendfile(int out_fd, int in_fd, uoff_t *offset, size_t count) { diff --git a/src/lib/test-network.c b/src/lib/test-network.c index 51d299608d..f44a16d956 100644 --- a/src/lib/test-network.c +++ b/src/lib/test-network.c @@ -1,7 +1,7 @@ /* Copyright (c) 2007-2012 Dovecot authors, see the included COPYING file */ #include "test-lib.h" -#include "network.h" +#include "net.h" struct test_net_is_in_network_input { const char *ip; diff --git a/src/lib/unix-socket-create.c b/src/lib/unix-socket-create.c index 324815429f..557d3314dc 100644 --- a/src/lib/unix-socket-create.c +++ b/src/lib/unix-socket-create.c @@ -1,7 +1,7 @@ /* Copyright (c) 2005-2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "unix-socket-create.h" #include diff --git a/src/lib/uri-util.c b/src/lib/uri-util.c index d29ce0433a..ad85af1f16 100644 --- a/src/lib/uri-util.c +++ b/src/lib/uri-util.c @@ -3,7 +3,7 @@ #include "lib.h" #include "array.h" #include "str.h" -#include "network.h" +#include "net.h" #include "uri-util.h" #include diff --git a/src/lmtp/client.h b/src/lmtp/client.h index db89bd86c2..6c204eba6b 100644 --- a/src/lmtp/client.h +++ b/src/lmtp/client.h @@ -1,7 +1,7 @@ #ifndef CLIENT_H #define CLIENT_H -#include "network.h" +#include "net.h" #define CLIENT_MAIL_DATA_MAX_INMEMORY_SIZE (1024*128) diff --git a/src/lmtp/lmtp-proxy.h b/src/lmtp/lmtp-proxy.h index 1658a513e8..163b10cebc 100644 --- a/src/lmtp/lmtp-proxy.h +++ b/src/lmtp/lmtp-proxy.h @@ -1,7 +1,7 @@ #ifndef LMTP_PROXY_H #define LMTP_PROXY_H -#include "network.h" +#include "net.h" #include "lmtp-client.h" #define LMTP_PROXY_DEFAULT_TTL 5 diff --git a/src/login-common/access-lookup.c b/src/login-common/access-lookup.c index 5152aa9a2f..b6fc60b2eb 100644 --- a/src/login-common/access-lookup.c +++ b/src/login-common/access-lookup.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "fdpass.h" #include "access-lookup.h" diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h index d48b9c4845..6f5767dd06 100644 --- a/src/login-common/client-common.h +++ b/src/login-common/client-common.h @@ -1,7 +1,7 @@ #ifndef CLIENT_COMMON_H #define CLIENT_COMMON_H -#include "network.h" +#include "net.h" #include "login-proxy.h" #include "sasl-server.h" #include "master-login.h" /* for LOGIN_MAX_SESSION_ID_LEN */ diff --git a/src/login-common/login-proxy-state.c b/src/login-common/login-proxy-state.c index 501f355977..9871716aa7 100644 --- a/src/login-common/login-proxy-state.c +++ b/src/login-common/login-proxy-state.c @@ -1,7 +1,7 @@ /* Copyright (c) 2009-2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "ioloop.h" #include "hash.h" #include "strescape.h" diff --git a/src/login-common/login-proxy.h b/src/login-common/login-proxy.h index 71c39a5878..58fe0122fe 100644 --- a/src/login-common/login-proxy.h +++ b/src/login-common/login-proxy.h @@ -1,7 +1,7 @@ #ifndef LOGIN_PROXY_H #define LOGIN_PROXY_H -#include "network.h" +#include "net.h" /* Max. number of embedded proxying connections until proxying fails. This is intended to avoid an accidental configuration where two proxies diff --git a/src/login-common/ssl-proxy-gnutls.c b/src/login-common/ssl-proxy-gnutls.c index 9e31c79e59..8e933e1025 100644 --- a/src/login-common/ssl-proxy-gnutls.c +++ b/src/login-common/ssl-proxy-gnutls.c @@ -2,7 +2,7 @@ #include "login-common.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "hash.h" #include "ssl-proxy.h" diff --git a/src/login-common/ssl-proxy-openssl.c b/src/login-common/ssl-proxy-openssl.c index 68985edef8..e5165520a9 100644 --- a/src/login-common/ssl-proxy-openssl.c +++ b/src/login-common/ssl-proxy-openssl.c @@ -3,7 +3,7 @@ #include "login-common.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "ostream.h" #include "read-full.h" #include "safe-memset.h" diff --git a/src/master/master-settings.c b/src/master/master-settings.c index 5fe25325fa..d7b9d970db 100644 --- a/src/master/master-settings.c +++ b/src/master/master-settings.c @@ -4,7 +4,7 @@ #include "array.h" #include "env-util.h" #include "istream.h" -#include "network.h" +#include "net.h" #include "str.h" #include "ipwd.h" #include "mkdir-parents.h" diff --git a/src/master/service-listen.c b/src/master/service-listen.c index 1445488857..7bc0775e17 100644 --- a/src/master/service-listen.c +++ b/src/master/service-listen.c @@ -4,7 +4,7 @@ #include "array.h" #include "fd-set-nonblock.h" #include "fd-close-on-exec.h" -#include "network.h" +#include "net.h" #ifdef HAVE_SYSTEMD #include "sd-daemon.h" #endif diff --git a/src/master/service.h b/src/master/service.h index b6c44b1ea2..20e10f25e3 100644 --- a/src/master/service.h +++ b/src/master/service.h @@ -1,7 +1,7 @@ #ifndef SERVICE_H #define SERVICE_H -#include "network.h" +#include "net.h" #include "master-settings.h" /* If a service process doesn't send its first status notification in diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c index 7c7a62530f..d7305e467c 100644 --- a/src/plugins/fts/fts-indexer.c +++ b/src/plugins/fts/fts-indexer.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "write-full.h" #include "strescape.h" diff --git a/src/plugins/fts/fts-parser-script.c b/src/plugins/fts/fts-parser-script.c index 4e09c9d729..f1dab1c055 100644 --- a/src/plugins/fts/fts-parser-script.c +++ b/src/plugins/fts/fts-parser-script.c @@ -2,7 +2,7 @@ #include "lib.h" #include "str.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "write-full.h" #include "module-context.h" diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c index 0d4ac57079..a8411d6f1e 100644 --- a/src/plugins/quota/quota.c +++ b/src/plugins/quota/quota.c @@ -4,7 +4,7 @@ #include "array.h" #include "hash.h" #include "str.h" -#include "network.h" +#include "net.h" #include "write-full.h" #include "eacces-error.h" #include "mailbox-list-private.h" diff --git a/src/plugins/replication/replication-plugin.c b/src/plugins/replication/replication-plugin.c index 9ea9c53646..26fe684562 100644 --- a/src/plugins/replication/replication-plugin.c +++ b/src/plugins/replication/replication-plugin.c @@ -6,7 +6,7 @@ #include "strescape.h" #include "fd-set-nonblock.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "write-full.h" #include "mail-user.h" #include "mail-namespace.h" diff --git a/src/plugins/stats/stats-connection.c b/src/plugins/stats/stats-connection.c index f915cef09f..88ea8d7e8c 100644 --- a/src/plugins/stats/stats-connection.c +++ b/src/plugins/stats/stats-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "hostpid.h" -#include "network.h" +#include "net.h" #include "str.h" #include "strescape.h" #include "mail-storage.h" diff --git a/src/plugins/zlib/doveadm-zlib.c b/src/plugins/zlib/doveadm-zlib.c index 75df8f8692..adeeae7912 100644 --- a/src/plugins/zlib/doveadm-zlib.c +++ b/src/plugins/zlib/doveadm-zlib.c @@ -1,7 +1,7 @@ /* Copyright (c) 2010-2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "istream-zlib.h" diff --git a/src/pop3-login/client.h b/src/pop3-login/client.h index 035e6bff16..34abacce70 100644 --- a/src/pop3-login/client.h +++ b/src/pop3-login/client.h @@ -1,7 +1,7 @@ #ifndef CLIENT_H #define CLIENT_H -#include "network.h" +#include "net.h" #include "client-common.h" #include "auth-client.h" diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c index 580a5d4d27..0a9d104a0c 100644 --- a/src/pop3/pop3-client.c +++ b/src/pop3/pop3-client.c @@ -3,7 +3,7 @@ #include "pop3-common.h" #include "array.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "crc32.h" diff --git a/src/replication/aggregator/notify-connection.c b/src/replication/aggregator/notify-connection.c index 6fdf7311af..71ec3e3a27 100644 --- a/src/replication/aggregator/notify-connection.c +++ b/src/replication/aggregator/notify-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "llist.h" diff --git a/src/replication/aggregator/replicator-connection.c b/src/replication/aggregator/replicator-connection.c index 43f28e2a43..8fb8f55fd3 100644 --- a/src/replication/aggregator/replicator-connection.c +++ b/src/replication/aggregator/replicator-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "buffer.h" diff --git a/src/replication/replicator/doveadm-connection.c b/src/replication/replicator/doveadm-connection.c index b8879d81cd..7ebb7fa9e8 100644 --- a/src/replication/replicator/doveadm-connection.c +++ b/src/replication/replicator/doveadm-connection.c @@ -2,7 +2,7 @@ #include "lib.h" #include "ioloop.h" -#include "network.h" +#include "net.h" #include "istream.h" #include "ostream.h" #include "str.h" diff --git a/src/stats/client-export.c b/src/stats/client-export.c index 20784260ef..7cc2dfd4ce 100644 --- a/src/stats/client-export.c +++ b/src/stats/client-export.c @@ -1,7 +1,7 @@ /* Copyright (c) 2011-2012 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "network.h" +#include "net.h" #include "ostream.h" #include "str.h" #include "strescape.h" diff --git a/src/stats/mail-stats.h b/src/stats/mail-stats.h index 807521020d..30753e7a27 100644 --- a/src/stats/mail-stats.h +++ b/src/stats/mail-stats.h @@ -1,7 +1,7 @@ #ifndef MAIL_STATS_H #define MAIL_STATS_H -#include "network.h" +#include "net.h" #include "guid.h" struct mail_stats { diff --git a/src/util/rawlog.c b/src/util/rawlog.c index 2e26880009..85961c548d 100644 --- a/src/util/rawlog.c +++ b/src/util/rawlog.c @@ -4,7 +4,7 @@ #include "ioloop.h" #include "fd-set-nonblock.h" -#include "network.h" +#include "net.h" #include "str.h" #include "write-full.h" #include "istream.h"