From 2d754dfd37a93f8ef21857b0eac52640259a5bff Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 15:58:19 +0000
Subject: [PATCH] aklog: 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.

Also add pwd.h to the list of headers that we check for in configure,
and that roken will include if they are available

Change-Id: I61ab95eeca11127a33bb668dddfc24ec6ce7f8f1
Reviewed-on: http://gerrit.openafs.org/4303
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 acinclude.m4            |  1 +
 src/aklog/aklog.c       | 33 ++++-----------------------------
 src/aklog/asetkey.c     | 17 ++++-------------
 src/aklog/klog.c        | 18 ++++--------------
 src/aklog/krb_util.c    |  8 +++-----
 src/aklog/linked_list.c | 10 +++-------
 src/aklog/skipwrap.c    |  4 +++-
 7 files changed, 22 insertions(+), 69 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index a58f396f7..ff01db48b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1224,6 +1224,7 @@ AC_CHECK_HEADERS([ \
 		   ncurses.h \
 		   netdb.h \
 		   netinet/in.h \
+		   pwd.h \
 		   regex.h \
 		   security/pam_modules.h \
 		   signal.h \
diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
index 44c4554d8..b72444709 100644
--- a/src/aklog/aklog.c
+++ b/src/aklog/aklog.c
@@ -35,32 +35,12 @@
  */
 
 #include <afsconfig.h>
+#include <afs/param.h>
+#include <afs/stds.h>
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <errno.h>
-
-#include <sys/stat.h>
-#include <fcntl.h>
+#include <roken.h>
 
-#include <sys/param.h>
-#include <sys/errno.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <pwd.h>
+#include <ctype.h>
 
 #include <afs/stds.h>
 #include <afs/ktc.h>
@@ -77,7 +57,6 @@
 #include <afs/com_err.h>
 #endif
 
-#include <afs/param.h>
 #ifdef AFS_SUN5_ENV
 #include <sys/ioccom.h>
 #endif
@@ -119,10 +98,6 @@
 #define AKLOG_BADPATH 6
 #define AKLOG_MISC 7
 
-#ifndef NULL
-#define NULL 0
-#endif
-
 #ifndef TRUE
 #define TRUE 1
 #endif
diff --git a/src/aklog/asetkey.c b/src/aklog/asetkey.c
index 416d1d6bb..2645027e4 100644
--- a/src/aklog/asetkey.c
+++ b/src/aklog/asetkey.c
@@ -7,20 +7,11 @@
  */
 
 #include <afsconfig.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif /* HAVE_MEMORY_H */
-#include <string.h>
-
+#include <afs/param.h>
 #include <afs/stds.h>
+
+#include <roken.h>
+
 #include <krb5.h>
 
 #ifndef HAVE_KERBEROSV_HEIM_ERR_H
diff --git a/src/aklog/klog.c b/src/aklog/klog.c
index b6defa4fc..a447c5133 100644
--- a/src/aklog/klog.c
+++ b/src/aklog/klog.c
@@ -9,30 +9,20 @@
 
 #include <afsconfig.h>
 #include <afs/param.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 <errno.h>
 
+#include <roken.h>
+
+#include <rx/xdr.h>
 #include <lock.h>
 #include <ubik.h>
-
-#include <stdio.h>
-#include <pwd.h>
 #include <afs/com_err.h>
 #include <afs/auth.h>
 #include <afs/afsutil.h>
 #include <afs/cellconfig.h>
-#ifdef AFS_RXK5
-#include "rxk5_utilafs.h"
-#endif
 #include <afs/ptclient.h>
 #include <afs/cmd.h>
+
 #include <krb5.h>
 
 #ifdef HAVE_KRB5_CREDS_KEYBLOCK
diff --git a/src/aklog/krb_util.c b/src/aklog/krb_util.c
index f256803a8..be47e688a 100644
--- a/src/aklog/krb_util.c
+++ b/src/aklog/krb_util.c
@@ -10,11 +10,10 @@
  */
 
 #include <afsconfig.h>
-
-#if 0
-#include <kerberosIV/mit-copyright.h>
-#endif
 #include <afs/stds.h>
+
+#include <roken.h>
+
 #include "aklog.h"
 #include <krb5.h>
 
@@ -24,7 +23,6 @@
 
 #include <afs/cellconfig.h>
 
-#include <string.h>
 #include <ctype.h>
 
 #define S_AD_SZ sizeof(struct sockaddr_in)
diff --git a/src/aklog/linked_list.c b/src/aklog/linked_list.c
index 7fd5a79e3..978ed44bd 100644
--- a/src/aklog/linked_list.c
+++ b/src/aklog/linked_list.c
@@ -8,15 +8,11 @@
  */
 
 #include <afsconfig.h>
+#include <afs/param.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "linked_list.h"
+#include <roken.h>
 
-#ifndef NULL
-#define NULL 0
-#endif
+#include "linked_list.h"
 
 #ifndef TRUE
 #define TRUE 1
diff --git a/src/aklog/skipwrap.c b/src/aklog/skipwrap.c
index 75c63fd63..7c00dcbc0 100644
--- a/src/aklog/skipwrap.c
+++ b/src/aklog/skipwrap.c
@@ -31,7 +31,9 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <stdio.h>
+
+#include <roken.h>
+
 #include "aklog.h"
 #include <krb5.h>
 #include "skipwrap.h"
-- 
2.39.5