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 138ae6f33b2476d2005c2156c4c3a53c958df313..cfba0e76bc31d1ff00edca92bb41caf4b2a6279a 100644 (file)
--- 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 ec411321cfcd9051089685b50de6f94770675338..4b9e3fb77003a5547a009a5b468c4a3530081fe7 100644 (file)
--- 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 35143f5a434632fcc2dfe28e64964160188bcf00..72cc9f8956313eeb5d2a05a4aa09904e4dd9a444 100644 (file)
--- 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 b16e70c935c473503f1ec2c9e3e42c3104d6254e..e5ddd3fdfdd212a83015492e193808b970b80c32 100644 (file)
--- 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 df3f859488fa9ae6bfc2704f0838d7a856e393e7..845da75eb793e54f498444fc7d4235affb33ad77 100644 (file)
--- 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 673c8d70f51164e86f867419c058d00f41fea5a5..8ec1c31a6f408a36d99a5c727f20e243c4ed493c 100644 (file)
--- 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 b18722b24c18c3c10ac33406a044d8972632deb2..db943ee1a68112a4ecec45b06a1926cb6d5239ad 100644 (file)
--- 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 6dedbc33430c5b910a8b16d055e14376069de5a8..031011f9694fdf995c19747038dd5ae970d6ce64 100644 (file)
--- 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 c520a1652a6d1c443a80ad2bc6a58803979e17a0..cc79d0e2be0f2b8725dcb2045be952e78a151e31 100644 (file)
--- 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 02168f246f629294de51688e22d8c50025de9e7b..78aad25f1286f69c84050065ef6b45c3161f60ac 100644 (file)
--- 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 b5de21247e6ec00cee86e80aefc1b448a8c736cc..0b0ff1c0b499f76acbf64e189c6e5639e85649e8 100644 (file)
--- 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 08bef22a6d964472e819871047bde983bc7caae4..7e45fc1a772058e03dfb72f44de6a2815bfd46ae 100644 (file)
--- 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 f31ff46485a8a2d3417fd030550b0bd5b6088060..9acce7551788e21b6a55ec74cee687997c80b09a 100755 (executable)
--- 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 b3584bc913de53f565236e17c08d13a52b3d2bad..40c0f54a50163c900b153418bd878ee57177e871 100644 (file)
--- 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 e2b13e1977a75add0e41fbb123f8a4127e8499fa..2299eca823485fa0babe88a4c56ce9aaa48a717b 100644 (file)
--- 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 e3879ee030b738083c9ce50f84019bb3f7291469..b402375fc04f7e61157dac09ab6addb927c5ed99 100644 (file)
--- 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 a020a4ef51cffb4bdfaed8ba525728c233e7bc74..4f1cd63bdf6fb2884863de9a5d04d9c008a2c711 100644 (file)
--- 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 459e667ed3718303e00f19902f19db478db2742d..eb5eee8bf4b56b8641de5b77b5bb7019ba66e568 100644 (file)
--- 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 c9aa183f347d51a54f526d1b601bcf88af614765..6cacb582a433d9a2edcc0bf7e4f2233d8e236f3f 100644 (file)
--- 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 073cb7493e75b553d12e15e36d4809e33c203896..4a6cc78b77b280421c510b8611ef435666b0e205 100644 (file)
--- 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 305099256f22bbff1575c3dc57e63ff57b5f12ff..1ed8257655cd807b3954461a8203f8d52332810a 100644 (file)
--- 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 0bfa2d4fa6e3652ccd8b35b53bfd8116afd8905a..e49042bb876dffa33d02b08b1b0c14707c2af0fb 100644 (file)
--- 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 63c62e60f4314e6e311d3cb86b56b8937cd90d70..5a7f727aea0a7a36eac38c23dc621c740e9b02e2 100644 (file)
--- 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 4bf67ea16a864c7a8ad05475cde1cbef77277aba..7a0dd9d4bf082d512f0be4a1ef6633955227a445 100644 (file)
--- 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 eda9240ad78ed467458bffecf0426c0aa2646d77..af1c92ce508034c87a099cbe8b05301a47d668c2 100644 (file)
--- 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 a83a26e6c0d5b110406721800474c23ef891e376..5ead346c7a2c36fbaab6f02f437e755f3bb00b73 100644 (file)
--- 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 de0c32ffcb841581c54c425d52a076c29bad0c76..aa1bc66b67eeca385a07cd247c70017bb4c87307 100644 (file)
--- 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 1b31a53b4af9113616b529a3c4b4c4bd4e94fd81..f8adbf57a45a352312f41c305640fd3997f873de 100644 (file)
--- 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 dac6e736b958362c4d0c6f0655c8ca86f26a16d6..ae31ca49a0494f88c562f5c3bf1d498ca602d809 100644 (file)
--- 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 93d6c0b87cd1a13c456282cdac2b26dfecd970ea..555d7b77d4780c7ad79f0618054e8f3585d60ecb 100644 (file)
--- 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><imap tag><NUL> */

diff --git a/src/imap-urlauth/imap-urlauth-client.c b/src/imap-urlauth/imap-urlauth-client.c
index 6c1a007e54ea2733bcc23cacc6dc7068d5b196d0..e49a620980153339fe1b5cf24847a53cf8d04821 100644 (file)
--- 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 ee872163fb1d93643a3dd4356a5c8ee5a17ed522..8204a12badfa67d4dcff06d93233b149bab8b020 100644 (file)
--- 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 b5240bcfaa67152545b568e9b3bb1654f59ca8c0..042c4178312d96da0385e5a6f21b9cca0d6c68d9 100644 (file)
--- 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 45a2da75af307d849731740c7619f3084d8627f6..dc19536a62a90fe6731cb16892399a45c8f9be20 100644 (file)
--- 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 fcfd4b8ae5f45e9415d3fc3c479c1c16d5d50544..eb02728feb19f46c8ae6cced27e64b142b4318b6 100644 (file)
--- 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 91170f514b8c269e57bb0191e023128e88300a35..0bd93bf70d39c26bc50b25fdaecf7c9d2260d7dd 100644 (file)
--- 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 4434f6b3f0ece106a576259811bdf8c67f939d71..77a98d70d9114aed14b92236c90022b871afab13 100644 (file)
--- 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 6cd11f834ae8b6e984d8575c0bb1ba81d7242d13..978b96f9bb6180856ca60d6b168433f893c9f00a 100644 (file)
--- 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 ccaabf4e4520aa0aee02ceb8ed4145d965c5de4f..3e51192ed1c0fd8ab5d126c1a58c40817842b5d2 100644 (file)
--- 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 2f69380eeefa24b47decfc3777aa07354a0faf2f..ed199dfde8bd00ceba5940ce13b7e2f17115f664 100644 (file)
--- 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 6e2f85eb1ba53d5c0eef24a8fec84415d5947530..bf263e744299a4f015bed1e81a008b599d0f6580 100644 (file)
--- 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 ac502124623ea996c8756c65f406f3faa962a68e..7b1952f0405d3d58c2400b6d8b85ae7dc5b774b0 100644 (file)
--- 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 f74d6dd07edb70712e8234d080d1fc51e00bc8af..65865e1d4c800e4d4959fbb72a9d60ef08d4faab 100644 (file)
--- 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 3986df595a1f6c4dd80b4ed522ae844dec6d7838..f4a9d54564ee3dd883fe17259789150819b3fdbb 100644 (file)
--- 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 d9b8e8fa7f6bdf57c744ab73de95c129b4b57624..ee3a3d972b726d0c1dd9386b7a0d0ca2e18a1e07 100644 (file)
--- 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 23707f5da0a1f8aa3db4b66be36350fe966cb3a6..a4fdd7e4c905ac8e1acee32c1829fb595e17057c 100644 (file)
--- 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 0e8e5f62e201e7d8d2d16e1cbfe3d48bba0f885e..9c179202a515aace15a6b1abaedd54ce4ce2e18b 100644 (file)
--- 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 5475171c150c4a54f5746ee5b5f2a70694acaf14..9588cf0a4c2ff0dd9751267b0b320d9b3a63a958 100644 (file)
--- 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 e845b267db3f58425cd7990f6020620d2dc1c579..8523603c8592617f4d1190fcbb7643f39d93b477 100644 (file)
--- 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 6aa0c203c2f9be6d410e3c9cb0567e7127e765d8..48b17069a24b81788dcedea822a7c10ba442fa8b 100644 (file)
--- 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 acbb1c2e418abed0cd42d4d4123ce76bb2b3eb20..d7e0811ea4f686a6f47ade0ddfc820914e3c5781 100644 (file)
--- 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 eda8dd994f1b7796004535c8106dd823d0abd442..e12f73c21561b085a13e8e7b72eb0c44e1d5fe9e 100644 (file)
--- 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 68cfc28ace3413ee85e42c2fc4d3fb34f3ef241b..c5d6daf8229fe94ba7c861be4e10d03f92ba0d56 100644 (file)
--- 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 72f3dccd990f0f813f746b5f198f7fdf1e4064c9..1f3f678b1b40046707a7da2c919e39da7346d02a 100644 (file)
--- 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 4335efcaee0352e10f6db04be433de3e619614b6..bed7b08f0d7c135aebc0083d6b34c63571f1c559 100644 (file)
--- 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 678daabec9f677bf5ce3d18950bc036d8954efd0..5566a969191cb92afb76fb3bd0b421988d4d0823 100644 (file)
--- 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 1b996fa87d5db31d19f72c68e6027e48a315e8d0..37b38e9dd8114671a1b84afc447a1d8f99e762e6 100644 (file)
--- 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 d1a534f45de16ae595c24893702331b2660eed07..53712acde42209e247a2eb6a9ca98e0123f4c410 100644 (file)
--- 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 d9ba49640efce8fb65598ad30b7ffd6b52a4f871..51769b677c954d8cb4969d77209621c9fe21f6ea 100644 (file)
--- 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 4cbdd66588f3a2e6ca40efb731c8498e8d7df3cc..077065b1ee39ed4f45cef25d397c9dc12b140732 100644 (file)
--- 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 dbb23ce233498a8814331ef8f61f2c52dec9e45c..66dc8ed288f69a0be2765b01672246d7716e54ad 100644 (file)
--- 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 bde15ed137cbd919f9672b4562f53ff9462d5909..5b4977e0889f4e7758e6dd5c237f3cd8db6ec6e7 100644 (file)
--- 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 7000442c0b30b19c8daeb4cd778888aec8687386..35b94642d6439bb218ee51e4751a0cf9fb8c6665 100644 (file)
--- 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 d3361807c3831e9cdeb7ef93f13fc6188ebd98ed..0051c02a87b846f740fb7e891f28d54ec27c9be8 100644 (file)
--- 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 c6903b51194e22189feabdd46ed02f6b473252cb..f52fff72d81d92a089e41905e820de021c12583c 100644 (file)
--- 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 3aca383595f88ab34fc682691169e8309f6513fb..ac1487d9cbb866744d3b4de8284f43be2b826581 100644 (file)
--- 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 <unistd.h>

diff --git a/src/lib/ioloop-notify-inotify.c b/src/lib/ioloop-notify-inotify.c
index 76b81766efaf8830fad3924465613951f20c676f..9e59f2f375eabfb57a0d8c959c80bfebf7e2c43d 100644 (file)
--- 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 <stdio.h>

diff --git a/src/lib/istream-file.c b/src/lib/istream-file.c
index dd52104da478d842c72bf2a8219e4172f7b747a1..5858124a27c0987ed1c9de2b94c496e46db9663c 100644 (file)
--- 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 <time.h>
 #include <unistd.h>

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 4db754e3c149cbf238643a2f80ebd754d135c608..34045ebf684711b6d670067c12f7ded1bcbcef2a 100644 (file)
--- 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 <stdlib.h>
 #include <unistd.h>

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 d8dde534b981a9f7af0392c48ec2ef32e5e59256..9631a38a8f430643b2783209cf82502dcab01ec5 100644 (file)
--- 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 <sys/socket.h>

diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
index 76a021b7172a3009314a815c9c0a20fed3ad76f5..85431fa7ac44d32bea5f8a4d25e5001578d21363 100644 (file)
--- 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 e65c36801c10b4f119c8aa0a8a6778917aff637b..8c46e75fa4848264c6961c624c3e6244847df92a 100644 (file)
--- 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 <sys/sendfile.h>
-#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 51d299608dd0d9c230802ddc7ae2cd84d80a75f6..f44a16d9563f5e1f0f415304501ff476ad95928d 100644 (file)
--- 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 324815429fd1301f27152ef104c03e48dee16984..557d3314dc0cb58fef4e086ac2c99568b5f89896 100644 (file)
--- 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 <unistd.h>

diff --git a/src/lib/uri-util.c b/src/lib/uri-util.c
index d29ce0433adf685fe4727c6c1d2fa861b53e2d7f..ad85af1f16565e35be9649d445df0547b68bcfa2 100644 (file)
--- 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 <ctype.h>

diff --git a/src/lmtp/client.h b/src/lmtp/client.h
index db89bd86c28632b21f56caf18854b4bc3bbcba2f..6c204eba6bedb202fb0054ffcee8183915482848 100644 (file)
--- 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 1658a513e80d6d692ae89218f062243592a68852..163b10cebc62fde2865d1f1069f9bcf13ecd10e1 100644 (file)
--- 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 5152aa9a2f334148a583206d4c45c043ba0cb7c1..b6fc60b2ebb8733dafec9197f04381cc7692fbe6 100644 (file)
--- 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 d48b9c4845dc36fe2f87407757bd301d0e52ce28..6f5767dd06adcd1cfa441affe6ea2b2e6c685c18 100644 (file)
--- 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 501f3559772208837920633dc61848cba9eb95ba..9871716aa7e45c7446a4942f0ecf6743f62d364a 100644 (file)
--- 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 71c39a58783d498753f3cfb5b72279583ca7a093..58fe0122fe3c53896592e3316672df97584e514c 100644 (file)
--- 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 9e31c79e598dcc35264330ca976b71888cf3fffc..8e933e1025818335066cea24b45db30cc9b02fbb 100644 (file)
--- 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 68985edef8b485026ab0150dc0257306766a8c53..e5165520a9beba8adce21924af99e25fb2a2d80a 100644 (file)
--- 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 5fe25325fa7d7ec277db8c11afc2226cc2db603a..d7b9d970dba816160ebb760bf77f16bb18a136ce 100644 (file)
--- 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 144548885740165119baccb7cacf57a13bd5a2ce..7bc0775e17e4ea387cc7ca544fd88b08afac3f8e 100644 (file)
--- 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 b6c44b1ea290389e71b6b668da5624fdb1dde564..20e10f25e3867e0fe63078155469dfadf424f63b 100644 (file)
--- 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 7c7a62530fcdfbdb7af29baee071423365818215..d7305e467c8af535e8778154ffcbe6f1e6995b56 100644 (file)
--- 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 4e09c9d72990a67db426833321599ac40c661493..f1dab1c05545a08922e17731fe854240a967f73a 100644 (file)
--- 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 0d4ac57079391e9aa64bec4b9c2d056b2c584c6c..a8411d6f1e0de5077fc40f34d9d89f34264e0f2b 100644 (file)
--- 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 9ea9c53646ecfc79a8cab2ab78dd341a8a5f2134..26fe6845621c77b42960ee0ae0a691d581a289c0 100644 (file)
--- 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 f915cef09fed5a69095507033c744502c4f98e0e..88ea8d7e8cc4562274108a5997012ab8ce7f8abb 100644 (file)
--- 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 75df8f8692b714835177b3202d578429efb880bf..adeeae7912404553cdcbdb8deea9001924a34325 100644 (file)
--- 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 035e6bff16034eeda47dee3d31eba9f60d79cbef..34abacce70252ffe7b9fb143ec4d32344c025ea5 100644 (file)
--- 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 580a5d4d27459860df50040cc8a9c7835fd93a29..0a9d104a0c41111d7a064ff1874eecda1e4c227d 100644 (file)
--- 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 6fdf7311af7a266b8868773cbcca2f858fd4f849..71ec3e3a270cf13e78d9089630f83811a4435fa2 100644 (file)
--- 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 43f28e2a43d19f662ba63e4440f8b46130917c06..8fb8f55fd372ed6c010568041d94ea7e7d7b6615 100644 (file)
--- 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 b8879d81cdbc2b3e41c42d9d6886a368b84e5b92..7ebb7fa9e81f97de99ca074192f7664c42dcb8ff 100644 (file)
--- 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 20784260ef1e1745f366129359ab3d85685af207..7cc2dfd4ce72383bf7a783f2b91157f4dc58c2d0 100644 (file)
--- 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 807521020dd17c3f2559f158b647026b4a83434b..30753e7a27e3757c23080359fbee1012d36675e9 100644 (file)
--- 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 2e26880009da98a8ae1f989a603aac74ad017345..85961c548d34058af96d30e19d3cb4bd9b88e019 100644 (file)
--- 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"