diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-07-05 11:50:58 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-07-08 19:19:24 -0400 |
| commit | 02a1123cf44381690c28f18ab2c4ba8036200539 (patch) | |
| tree | 821ad7e29d2f90227b6f12dc63aaae948baa2447 /src/slave | |
| parent | 6a8da91b691b8f51ac62d8142cd2fa32a69f3d15 (diff) | |
| download | krb5-02a1123cf44381690c28f18ab2c4ba8036200539.tar.gz krb5-02a1123cf44381690c28f18ab2c4ba8036200539.tar.xz krb5-02a1123cf44381690c28f18ab2c4ba8036200539.zip | |
Include autoconf.h before system headers
Include autoconf.h (either directly or via proxy) before system
headers, so that feature test macros defined there can affect the
system namespace. Where include order was changed, eliminate some
redundant or unnecessary includes.
ticket: 7961
Diffstat (limited to 'src/slave')
| -rw-r--r-- | src/slave/kprop.c | 6 | ||||
| -rw-r--r-- | src/slave/kprop_sock.c | 7 | ||||
| -rw-r--r-- | src/slave/kpropd.c | 11 | ||||
| -rw-r--r-- | src/slave/kproplog.c | 3 |
4 files changed, 9 insertions, 18 deletions
diff --git a/src/slave/kprop.c b/src/slave/kprop.c index 7446c76ef..d28a1af40 100644 --- a/src/slave/kprop.c +++ b/src/slave/kprop.c @@ -24,13 +24,10 @@ * or implied warranty. */ -#include <errno.h> +#include "k5-int.h" #include <locale.h> -#include <stdio.h> -#include <ctype.h> #include <sys/file.h> #include <signal.h> -#include <string.h> #include <sys/types.h> #include <sys/time.h> #include <sys/stat.h> @@ -40,7 +37,6 @@ #include <netdb.h> #include <fcntl.h> -#include "k5-int.h" #include "com_err.h" #include "fake-addrinfo.h" #include "kprop.h" diff --git a/src/slave/kprop_sock.c b/src/slave/kprop_sock.c index a439b378c..1591a8b18 100644 --- a/src/slave/kprop_sock.c +++ b/src/slave/kprop_sock.c @@ -26,13 +26,12 @@ /* sockaddr2krbaddr() utility function used by kprop and kpropd */ -#include <stdlib.h> -#include <sys/types.h> -#include <sys/socket.h> - #include "k5-int.h" #include "kprop.h" +#include <sys/types.h> +#include <sys/socket.h> + /* * Convert an IPv4 or IPv6 socket address to a newly allocated krb5_address. * There is similar code elsewhere in the tree, so this should possibly become diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c index 0f4a8f000..18a8e1d2c 100644 --- a/src/slave/kpropd.c +++ b/src/slave/kpropd.c @@ -51,12 +51,14 @@ */ +#include "k5-int.h" +#include "com_err.h" +#include "fake-addrinfo.h" + #include <locale.h> -#include <stdio.h> #include <ctype.h> #include <sys/file.h> #include <signal.h> -#include <string.h> #include <fcntl.h> #include <sys/types.h> #include <sys/time.h> @@ -69,11 +71,6 @@ #include <netdb.h> #include <syslog.h> -#include "k5-int.h" -#include "com_err.h" -#include "fake-addrinfo.h" -#include <errno.h> - #include "kprop.h" #include <iprop_hdr.h> #include "iprop.h" diff --git a/src/slave/kproplog.c b/src/slave/kproplog.c index ab49a0fe5..efa1f432d 100644 --- a/src/slave/kproplog.c +++ b/src/slave/kproplog.c @@ -8,15 +8,14 @@ * This module will parse the update logs on the master or slave servers. */ +#include "k5-int.h" #include <locale.h> -#include <stdio.h> #include <sys/types.h> #include <sys/mman.h> #include <time.h> #include <limits.h> #include <locale.h> #include <syslog.h> -#include "k5-int.h" #include <kdb_log.h> #include <kadm5/admin.h> |