kauth: Tidy header includes

Since we adopted libroken, we get a lot of header includes automatically
from roken.h. Use these, instead of including lots of things multiple
times.

This adds arpa/inet.h to the list of headers that configure checks for

Change-Id: I1792ede4be761238bb05567c1d763ed63f50051e
Reviewed-on: http://gerrit.openafs.org/4330
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/acinclude.m4 b/acinclude.m4
index 9f3390abebacd0fe85512f7e9b4bbd916b442130..457c55f74dcebdb805f06207aa9b2cd9b3e5c1de 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1216,6 +1216,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 AC_CHECK_HEADERS([ \
+                  arpa/inet.h \
                   arpa/nameser.h \
                   curses.h\
                   direct.h \

diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c
index a65cf19590e5e24833e1e55fca321cefac819e9b..6509b32aa2928358a8199237f5d43ae23d1efcb6 100644 (file)
--- a/src/kauth/admin_tools.c
+++ b/src/kauth/admin_tools.c
@@ -14,33 +14,27 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
 #include <ctype.h>
-#include <string.h>
 
-    /* These two needed for rxgen output to work */
-#include <sys/types.h>
-#include <rx/xdr.h>
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
 
-#include <stdio.h>
+#include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
 #include <lock.h>
 #define UBIK_LEGACY_CALLITER 1
 #include <ubik.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#endif
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
 #include <afs/com_err.h>
 #include <afs/afsutil.h>
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
+
 #include "kauth.h"
 #include "kauth_internal.h"
 #include "kautils.h"

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 22a96309a206e070dfe6e320371c9ec5baec8ddf..70237a699a525a2ffd74e5440277eba88575d9b3 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -11,6 +11,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -19,28 +20,16 @@
 # pragma GCC diagnostic warning "-Wimplicit-function-declaration"
 #endif
 
+#include <hcrypto/des.h>
+
 #define UBIK_LEGACY_CALLITER 1
 
-#include <afs/stds.h>
 #include <afs/pthread_glock.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 #include <rx/rxkad.h>
 #include <afs/cellconfig.h>
 #include <ubik.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
-#include <hcrypto/des.h>
 
 #include "kauth.h"
 #include "kautils.h"

diff --git a/src/kauth/client.c b/src/kauth/client.c
index 9a989059358955a5544c5b562fd940ad69853ee5..7f5015cf15e6f74f6172070b3356891016b422fe 100644 (file)
--- a/src/kauth/client.c
+++ b/src/kauth/client.c
@@ -9,28 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
+
 #include <afs/pthread_glock.h>
-#include <stdio.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <crypt.h>
-#endif
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#if !defined(__USE_XOPEN)
-#define __USE_XOPEN
-#endif
-#include <unistd.h>
-#endif
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
 
 #include "kauth.h"
 #include "kautils.h"

diff --git a/src/kauth/crypt.c b/src/kauth/crypt.c
index dcee3bea964436a8fafbe378ebbc2c306e513c4f..e44be122bd55b89f6f7295ea96f76a5c7520aa98 100644 (file)
--- a/src/kauth/crypt.c
+++ b/src/kauth/crypt.c
@@ -34,14 +34,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 /* This crypt() implementation is only used by the Andrew string_to_key
  * function on Windows. All Unix platforms use their own crypt() 
  * implementation
  */
 
 #include <windows.h>
-#include <stdlib.h>
-#include <string.h>
 
 /*
  * UNIX password, and DES, encryption.

diff --git a/src/kauth/decode_ticket.c b/src/kauth/decode_ticket.c
index 55b47bc24b2303e5dd00ac0b38a38dc15a4c04ac..76e18044c00bf49c806ae89bf0cdf695552b52c5 100644 (file)
--- a/src/kauth/decode_ticket.c
+++ b/src/kauth/decode_ticket.c
@@ -10,11 +10,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <hcrypto/des.h>
+
 #include <afs/com_err.h>
 #include <afs/auth.h>
 #include <rx/rxkad.h>
+
 #include "kautils.h"
 
 static char *whoami;

diff --git a/src/kauth/ka-forwarder.c b/src/kauth/ka-forwarder.c
index 091e7c6ef71930b8ec7fc2a8f04354ea6d789809..8d82acc576b9aa596ca0cf6d5931e2895ae2a757 100644 (file)
--- a/src/kauth/ka-forwarder.c
+++ b/src/kauth/ka-forwarder.c
@@ -32,21 +32,11 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
 #include <afs/stds.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <netdb.h>
+#include <roken.h>
+
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
 
 #if    HAVE_GETOPT_H
 #include <getopt.h>

diff --git a/src/kauth/ka_util.c b/src/kauth/ka_util.c
index e7e4acf9e2d468be494e5bb82a5b46e6386996c5..a3e0b8b57427fb223a1e9e76f38e614000637529 100644 (file)
--- a/src/kauth/ka_util.c
+++ b/src/kauth/ka_util.c
@@ -8,25 +8,20 @@
  *                  therefore the database must be quiescent for the
  *                  output of this program to be valid.
  */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/file.h>
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#include <ctype.h>
 
 #include <lock.h>
-#include <netinet/in.h>
 #define UBIK_INTERNALS
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
+
 #include "kauth.h"
 #include "kaserver.h"
 #include "kautils.h"

diff --git a/src/kauth/kaauxdb.c b/src/kauth/kaauxdb.c
index 887f82348ab294808320f8e3fb09e9053f59ab45..97c42c19fe9f3535f79ac889db05be785beaa53a 100644 (file)
--- a/src/kauth/kaauxdb.c
+++ b/src/kauth/kaauxdb.c
@@ -16,15 +16,6 @@
 
 #include <roken.h>
 
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <string.h>
 #include <rx/rxkad.h>
 #define UBIK_INTERNALS
 #include <ubik.h>

diff --git a/src/kauth/kadatabase.c b/src/kauth/kadatabase.c
index e691350dcc8470e8d4e56888bbe58d896f79d449..8864bc88c3f1eb7ebb72c6ecfdaf344cd445c8b2 100644 (file)
--- a/src/kauth/kadatabase.c
+++ b/src/kauth/kadatabase.c
@@ -12,17 +12,11 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <ubik.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <afs/afsutil.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kaserver.h"

diff --git a/src/kauth/kalocalcell.c b/src/kauth/kalocalcell.c
index 0eaaf44e4e5924f7d967a6b4b0a7ba6e6ad2e680..68d11b4998dc3b1808dc2fdbf8f475deda25ba68 100644 (file)
--- a/src/kauth/kalocalcell.c
+++ b/src/kauth/kalocalcell.c
@@ -13,19 +13,12 @@
 #include <roken.h>
 
 #include <afs/pthread_glock.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <afs/cellconfig.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
+
 #include "kauth.h"
 #include "kautils.h"
-#include <afs/afsutil.h>
 
 #ifdef UKERNEL
 #include "afs_usrops.h"

diff --git a/src/kauth/kalog.c b/src/kauth/kalog.c
index 0bc16d7cce46552934f787330286db624a649890..0b209ffbeaf9f0002672113eda8a2c65b47633c1 100644 (file)
--- a/src/kauth/kalog.c
+++ b/src/kauth/kalog.c
@@ -21,15 +21,6 @@
 
 #include <roken.h>
 
-#include <stdio.h>
-#include <afs/afsutil.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <sys/types.h>
-#include <time.h>
-#include <signal.h>
 #include <afs/afsutil.h>
 #include "kauth.h"
 #include "kalog.h"

diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c
index 365994f94c39b07b81a26f6ca381e26355f8438d..8dc0fe3014d3baf4525b51a9b636bc39b839b158 100644 (file)
--- a/src/kauth/kaprocs.c
+++ b/src/kauth/kaprocs.c
@@ -9,25 +9,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
 #ifdef IGNORE_SOME_GCC_WARNINGS
 # pragma GCC diagnostic warning "-Wdeprecated-declarations"
 #endif
 
-#include <afs/stds.h>
-#include <errno.h>
 #include "kauth.h"
-#include <sys/types.h>
-#include <time.h>
-#ifdef AFS_NT40_ENV
-#include <afs/afsutil.h>
-#else
-#include <sys/resource.h>
-#include <sys/file.h>
-#endif
-#include <stdio.h>
 
 #define HC_DEPRECATED
 #include <hcrypto/des.h>
@@ -38,22 +32,17 @@
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <rx/rxkad.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <string.h>
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/com_err.h>
+#include <afs/afsutil.h>
+#include <afs/audit.h>
 
 #include "kautils.h"
 #include "kaserver.h"
 #include "kalog.h"
 #include "kaport.h"
 #include "kauth_internal.h"
-#include "afs/audit.h"
 
 #include "kadatabase.h"
 #include "kaprocs.h"

diff --git a/src/kauth/kas.c b/src/kauth/kas.c
index 736b229f98d7faed05ecb3ac19be3a2dbd994eb2..fa57df58d7e2aa5b3ec99131eb7e5523f1db8ca2 100644 (file)
--- a/src/kauth/kas.c
+++ b/src/kauth/kas.c
@@ -10,25 +10,17 @@
 /* These two needed for rxgen output to work */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
+#ifdef AFS_NT40_ENV
+#include <WINNT/afsevent.h>
 #endif
 
-#include <sys/types.h>
 #include <rx/xdr.h>
-
 #include <lock.h>
 #include <ubik.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#else
-#include <WINNT/afsevent.h>
-#endif
-#include <string.h>
 #include <afs/cellconfig.h>
 #include <afs/com_err.h>
 #include <afs/cmd.h>
@@ -37,7 +29,6 @@
 #include "kauth_internal.h"
 #include "kautils.h"
 
-
 int
 main(int argc, char *argv[])
 {

diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index a058dc4aa9992b8cbfea146f595c56ad70013a74..df5a485c9aecd14d6f410b15a9493b71aa47ec7e 100644 (file)
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -9,29 +9,15 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <WINNT/afsevent.h>
-#else
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-#include "kalog.h"             /* for OpenLog() */
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
 #endif
+
+
 #include <lwp.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
@@ -44,7 +30,8 @@
 #include <afs/com_err.h>
 #include <afs/audit.h>
 #include <ubik.h>
-#include <sys/stat.h>
+
+#include "kalog.h"             /* for OpenLog() */
 #include "kauth.h"
 #include "kauth_internal.h"
 #include "kautils.h"

diff --git a/src/kauth/katoken.c b/src/kauth/katoken.c
index 90107cc18ca759df4c5b35dc38730d68ea12e10b..71521b0ab45b7f2395a6b693c06047c62eacfe6c 100644 (file)
--- a/src/kauth/katoken.c
+++ b/src/kauth/katoken.c
@@ -13,6 +13,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -20,26 +21,15 @@
 # include "afsincludes.h"
 #endif
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
 #include <afs/pthread_glock.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-#include <string.h>
-/* netinet/in.h and cellconfig.h  are needed together */
 #include <afs/cellconfig.h>
-    /* these are needed together */
+#include <afs/auth.h>
 #include <lock.h>
 #include <ubik.h>
 
 #include "kauth.h"
 #include "kautils.h"
-#include <afs/auth.h>
 
 
 afs_int32

diff --git a/src/kauth/kautils.c b/src/kauth/kautils.c
index 8dd6242a1351d7e6345ca1d53388567f9258309f..ddf92ee811839ccf674185681fae5d864687e0a8 100644 (file)
--- a/src/kauth/kautils.c
+++ b/src/kauth/kautils.c
@@ -9,26 +9,18 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/afsutil.h>
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/file.h>
-#endif
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
 #include <ctype.h>
+
+#include <hcrypto/des.h>
+
+#include <afs/afsutil.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <hcrypto/des.h>
+
 #include "kauth.h"
 #include "kautils.h"
 

diff --git a/src/kauth/kdb.c b/src/kauth/kdb.c
index 5d73f6d2201364175e74ffeeea4bfaf8df61bede..081a52a2edafaa6037e51594e40d2a17bccd873a 100644 (file)
--- a/src/kauth/kdb.c
+++ b/src/kauth/kdb.c
@@ -10,18 +10,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <fcntl.h>
-#include <sys/types.h>
-#include <time.h>
-#include <stdio.h>
-#ifndef AFS_NT40_ENV
-#include <strings.h>
-#endif
 #include <afs/cmd.h>
+#include <afs/afsutil.h>
+
 #include "kauth.h"
 #include "kalog.h"
-#include <afs/afsutil.h>
 
 #ifdef AUTH_DBM_LOG
 

diff --git a/src/kauth/kkids.c b/src/kauth/kkids.c
index 5d9fb7a6cde5a58747595a21b1543f228dc4600b..fb2f5b062d43e66f33f1ff26b822bfd5eee2c8a3 100644 (file)
--- a/src/kauth/kkids.c
+++ b/src/kauth/kkids.c
@@ -14,26 +14,18 @@
 /* These two needed for rxgen output to work */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <afs/fs_utils.h>
 #else
-#include <unistd.h>
-#include <netinet/in.h>
 #include <afs/venus.h>
 #endif
-#include <signal.h>
-#include <afs/stds.h>
+
 #include <rx/xdr.h>
 #include <afs/prs_fs.h>
-#include <stdlib.h>
-#include <string.h>
 #include <afs/sys_prototypes.h>
 #include <afs/afs_consts.h>
 

diff --git a/src/kauth/klog.c b/src/kauth/klog.c
index 31df3b8f602daf55bb5e616a40682f1e7cbf881e..3c273ad42c5f0433eb85c75b03cad96a604a8597 100644 (file)
--- a/src/kauth/klog.c
+++ b/src/kauth/klog.c
@@ -9,23 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
-#include <string.h>
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#include <pwd.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kauth_internal.h"

diff --git a/src/kauth/klogin.c b/src/kauth/klogin.c
index 97da77a845256364f71eaa622d294c278d5e7166..7fcdf40a8f5cb52be60c158c86580b7894b662f7 100644 (file)
--- a/src/kauth/klogin.c
+++ b/src/kauth/klogin.c
@@ -21,29 +21,18 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
-#include <sys/param.h>
 
 #define quota(a,b,c,d) 0
 
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/file.h>
 #include <afs/afsutil.h>
 #include <sgtty.h>
 #include <utmp.h>
-#include <signal.h>
-#include <pwd.h>
-#include <stdio.h>
 #include <lastlog.h>
-#include <errno.h>
 #include <ttyent.h>
 
-
-#include <syslog.h>
-
 #include <grp.h>
 
 static gid_t tty_gid(int default_gid);

diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c
index 6852e44a78fc081ddeb8adace89abee30e367b3c..4b4be5a53af7cd394c8ef65c8fdac0e5740a4e1d 100644 (file)
--- a/src/kauth/knfs.c
+++ b/src/kauth/knfs.c
@@ -13,19 +13,12 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <ctype.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <time.h>
-#include <netdb.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <string.h>
+
 #include <afs/vice.h>
 #include <afs/cmd.h>
 #include <afs/auth.h>

diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c
index 220b4605966528c2f03398033503653d89a66118..031f8953d374de11b0a16ebd0be2c3e776d5d08a 100644 (file)
--- a/src/kauth/kpasswd.c
+++ b/src/kauth/kpasswd.c
@@ -10,40 +10,27 @@
 /* These two needed for rxgen output to work */
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <limits.h>
 
-#include <rx/xdr.h>
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
 
+#include <rx/xdr.h>
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#ifndef AFS_NT40_ENV
-#include <pwd.h>
-#endif
-#include <string.h>
-#include <signal.h>
 #include <afs/com_err.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kkids.h"
 
-#ifndef AFS_NT40_ENV
-#include <unistd.h>
-#endif
-#include <limits.h>
 
 
 /* This code borrowed heavily from the log program.  Here is the intro comment

diff --git a/src/kauth/kpwvalid.c b/src/kauth/kpwvalid.c
index 89957051edecbb5cad4983946dcdd1e883203e09..710bdefc9f8088749f63589ba827b2eb74e9caf6 100644 (file)
--- a/src/kauth/kpwvalid.c
+++ b/src/kauth/kpwvalid.c
@@ -10,9 +10,8 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
 #ifdef AFS_NT40_ENV
 #include <WINNT/afsevent.h>
 #endif

diff --git a/src/kauth/krb_tf.c b/src/kauth/krb_tf.c
index ed48dd50fe5d1eb127dff7560ea745731102ef11..9bd3eae5210f5bbccf52e36b19093d8512e79845 100644 (file)
--- a/src/kauth/krb_tf.c
+++ b/src/kauth/krb_tf.c
@@ -49,19 +49,9 @@
 
 #include <roken.h>
 
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef AFS_NT40_ENV
-#include <io.h>
-#else
-#include <sys/file.h>
-#endif
-#include <string.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
-#include <errno.h>
 #include <afs/auth.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "kauth_internal.h"

diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c
index 5685b1b6478f255627b2a431a5cbb8947d40f8c9..c59fbce18aba01e4cf3ef4fc7e74bd268089baf6 100644 (file)
--- a/src/kauth/krb_udp.c
+++ b/src/kauth/krb_udp.c
@@ -14,6 +14,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
@@ -21,21 +22,9 @@
 # pragma GCC diagnostic warning "-Wdeprecated-declarations"
 #endif
 
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <errno.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <afs/errmap_nt.h>
-#define snprintf _snprintf
-#else
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
 #endif
-#include <string.h>
-#include <afs/afsutil.h>
-#include <time.h>
 
 #define HC_DEPRECATED
 #include <hcrypto/des.h>
@@ -48,7 +37,6 @@
 #include <afs/auth.h>
 #include <ubik.h>
 
-
 #include "kauth.h"
 #include "kautils.h"
 #include "kauth_internal.h"

diff --git a/src/kauth/manyklog.c b/src/kauth/manyklog.c
index 0a0c84bea33796f3c39ef4e79b20a896350ca979..83c432e9fad6d9b14593952bc19ed37345714f0f 100644 (file)
--- a/src/kauth/manyklog.c
+++ b/src/kauth/manyklog.c
@@ -9,23 +9,17 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <sys/types.h>
 #include <rx/xdr.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
-
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#include <pwd.h>
 #include <afs/com_err.h>
 #include <afs/cellconfig.h>
 #include <afs/cmd.h>
+
 #include "kauth.h"
 #include "kautils.h"
 #include "assert.h"

diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c
index eed9d7455f777569440e39b8fb2fd40f357c8214..2722b35719783ccdd4e31214678b27005e1a7855 100644 (file)
--- a/src/kauth/rebuild.c
+++ b/src/kauth/rebuild.c
@@ -12,25 +12,11 @@
 
 #include <roken.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <fcntl.h>
-#include <io.h>
-#else
-#include <sys/file.h>
-#include <netinet/in.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <time.h>
+#include <hcrypto/des.h>
+
 #include <ubik.h>
 #include <afs/cmd.h>
-#include <hcrypto/des.h>
 #include <rx/rxkad.h>
-
 #include <afs/com_err.h>
 
 #include "kauth.h"

diff --git a/src/kauth/user.c b/src/kauth/user.c
index 28220528e850c77ba7df7419106c865f5ccbc804..af509feac3e28289f4d1e445cf8e6beb73f674af 100644 (file)
--- a/src/kauth/user.c
+++ b/src/kauth/user.c
@@ -12,19 +12,14 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
+#include <roken.h>
+
+#include <hcrypto/des.h>
+#include <hcrypto/ui.h>
 
-#include <afs/stds.h>
-#include <signal.h>
 #include <afs/com_err.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
 #include <afs/cellconfig.h>
 #include <afs/auth.h>
 #include <afs/ptint.h>
@@ -40,8 +35,7 @@
 #include <rx/rx.h>
 #include <rx/rx_globals.h>
 #include <rx/rxkad.h>          /* max ticket lifetime */
-#include <hcrypto/des.h>
-#include <hcrypto/ui.h>
+
 
 #include "kauth.h"
 #include "kautils.h"

diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c
index e471474bc497c43aec9dd22242ab05bc5b886734..60ce3b87d3df3087ea54b75e3a51b094b8d82daa 100644 (file)
--- a/src/kauth/user_nt.c
+++ b/src/kauth/user_nt.c
@@ -16,10 +16,6 @@
 
 #include <windows.h>
 #include <rpc.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>             /* sprintf */
-#include <malloc.h>
 #include <afs/kautils.h>
 #include <afs/cm.h>
 #include <afs/cm_config.h>