From 37f537a21db6d560dd16a53ff5e0d2f0456d4c48 Mon Sep 17 00:00:00 2001
From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 19 Dec 2011 17:11:31 -0500
Subject: [PATCH] Include afsconfig.h before anything else

afsconfig.h can define various preprocessor symbols that can affect
how system headers behave. For example, the presence of the
_POSIX_PTHREAD_SEMANTICS symbol changes the number of arguments to
getpwnam_r on at least Solaris 8. So, we must include afsconfig.h
before including anything else, to ensure consistency.

Change-Id: I84bc73b3fada5dbc68cd355c24f2f746f2e982b3
Reviewed-on: http://gerrit.openafs.org/6387
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---
 src/afs/SOLARIS/osi_groups.c      | 6 +++---
 src/afs/afsincludes.h             | 2 +-
 src/afsmonitor/afsmon-output.c    | 5 +++--
 src/afsmonitor/afsmon-parselog.c  | 3 ++-
 src/aklog/aklog.h                 | 3 ++-
 src/config/mc.c                   | 3 ++-
 src/kauth/test/test_date.c        | 2 +-
 src/kauth/test/test_interim_ktc.c | 6 +++---
 src/lwp/test/selclient.c          | 8 ++++----
 src/lwp/test/selserver.c          | 8 ++++----
 src/lwp/test/selsubs.c            | 8 ++++----
 src/mcas/gc.c                     | 5 +++--
 src/rx/test/kctest.c              | 2 +-
 src/rx/test/kstest.c              | 2 +-
 src/tests/create-stat.c           | 4 ++--
 src/tests/snprintf.c              | 2 +-
 src/util/secutil_nt.c             | 2 +-
 17 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/afs/SOLARIS/osi_groups.c b/src/afs/SOLARIS/osi_groups.c
index a6cd8e4..0e4078a 100644
--- a/src/afs/SOLARIS/osi_groups.c
+++ b/src/afs/SOLARIS/osi_groups.c
@@ -14,14 +14,14 @@
  *
  */
 
+#include <afsconfig.h>
+#include "afs/param.h"
+
 #include <unistd.h>
 #ifdef AFS_SUN510_ENV
 #include <sys/cred.h>
 #endif
 
-#include <afsconfig.h>
-#include "afs/param.h"
-
 
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h
index 1ad83aa..dd9284a 100644
--- a/src/afs/afsincludes.h
+++ b/src/afs/afsincludes.h
@@ -10,12 +10,12 @@
 #ifndef AFS_INCLUDES_H
 #define AFS_INCLUDES_H 1
 
+#include <afsconfig.h>
 
 #ifdef UKERNEL
 #include <UKERNEL/afsincludes.h>
 #else
 
-#include <afsconfig.h>
 
 /* AFS based headers */
 #include "afs/stds.h"
diff --git a/src/afsmonitor/afsmon-output.c b/src/afsmonitor/afsmon-output.c
index 67ed97a..b09ff81 100644
--- a/src/afsmonitor/afsmon-output.c
+++ b/src/afsmonitor/afsmon-output.c
@@ -15,10 +15,11 @@
  *
  *-------------------------------------------------------------------------*/
 
-#include <stdio.h>
-#include <time.h>
 #include <afsconfig.h>
 #include <afs/param.h>
+
+#include <stdio.h>
+#include <time.h>
 #include <string.h>
 
 
diff --git a/src/afsmonitor/afsmon-parselog.c b/src/afsmonitor/afsmon-parselog.c
index e9b99d5..faf7fd8 100644
--- a/src/afsmonitor/afsmon-parselog.c
+++ b/src/afsmonitor/afsmon-parselog.c
@@ -17,10 +17,11 @@
  *
  *-------------------------------------------------------------------------*/
 
-#include <stdio.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <stdio.h>
+
 
 #include <afs/xstat_fs.h>
 #include <afs/xstat_cm.h>
diff --git a/src/aklog/aklog.h b/src/aklog/aklog.h
index 27665b9..311828d 100644
--- a/src/aklog/aklog.h
+++ b/src/aklog/aklog.h
@@ -8,9 +8,10 @@
 #ifndef __AKLOG_H__
 #define __AKLOG_H__
 
+#include <afsconfig.h>
+
 #include <krb5.h>
 #include "linked_list.h"
-#include <afsconfig.h>
 
 #ifdef __STDC__
 #define ARGS(x) x
diff --git a/src/config/mc.c b/src/config/mc.c
index 18d2efc..b457e7d 100644
--- a/src/config/mc.c
+++ b/src/config/mc.c
@@ -7,6 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include "afsconfig.h"
+
 #define	MAXLINELEN	1024
 #define	MAXTOKLEN	100
 #include <sys/param.h>
@@ -15,7 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "afsconfig.h"
 #include <string.h>
 
 #define TOK_DONTUSE 1		/* Don't copy if match and this flag is set. */
diff --git a/src/kauth/test/test_date.c b/src/kauth/test/test_date.c
index 56b9c56..2466a26 100644
--- a/src/kauth/test/test_date.c
+++ b/src/kauth/test/test_date.c
@@ -13,8 +13,8 @@
  * specifies the terms and conditions for redistribution.
  */
 
-#include <sys/param.h>
 #include <afsconfig.h>
+#include <sys/param.h>
 
 
 #include <stdio.h>
diff --git a/src/kauth/test/test_interim_ktc.c b/src/kauth/test/test_interim_ktc.c
index 76bd60e..f850ed9 100644
--- a/src/kauth/test/test_interim_ktc.c
+++ b/src/kauth/test/test_interim_ktc.c
@@ -9,15 +9,15 @@
 
 /* Test ktc related calls as well as some file access stuff. */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/file.h>
 #include <arpa/inet.h>
 #include <afs/prs_fs.h>
-#include <afsconfig.h>
-#include <afs/param.h>
-
 
 #include <afs/stds.h>
 #include <afs/com_err.h>
diff --git a/src/lwp/test/selclient.c b/src/lwp/test/selclient.c
index 5222702..254418a 100644
--- a/src/lwp/test/selclient.c
+++ b/src/lwp/test/selclient.c
@@ -34,6 +34,10 @@
  * on IRIX 6.2 and 6.4.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -50,10 +54,6 @@
 #include <assert.h>
 #include <time.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "lwp.h"
 #include "seltest.h"
diff --git a/src/lwp/test/selserver.c b/src/lwp/test/selserver.c
index 4540124..09397a6 100644
--- a/src/lwp/test/selserver.c
+++ b/src/lwp/test/selserver.c
@@ -34,6 +34,10 @@
  * on IRIX 6.2 and 6.4.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
+
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -51,10 +55,6 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "lwp.h"
 #include "seltest.h"
diff --git a/src/lwp/test/selsubs.c b/src/lwp/test/selsubs.c
index f20dea4..f3403a1 100644
--- a/src/lwp/test/selsubs.c
+++ b/src/lwp/test/selsubs.c
@@ -8,6 +8,10 @@
  */
 
 /* selsubs.c - common code for client and server. */
+#include <afsconfig.h>
+#include <afs/param.h>
+
+
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -25,10 +29,6 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "lwp.h"
 #include "seltest.h"
diff --git a/src/mcas/gc.c b/src/mcas/gc.c
index 369dd5c..53812c4 100644
--- a/src/mcas/gc.c
+++ b/src/mcas/gc.c
@@ -34,6 +34,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,8 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "portable_defns.h"
 #include "gc.h"
 
-#include <afsconfig.h>
-#include <afs/param.h>
 #include <afs/afsutil.h>
 
 /*#define MINIMAL_GC*/
diff --git a/src/rx/test/kctest.c b/src/rx/test/kctest.c
index 6fc0ace..abf98fc 100644
--- a/src/rx/test/kctest.c
+++ b/src/rx/test/kctest.c
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "afs/param.h"
 #include <afsconfig.h>
+#include "afs/param.h"
 
 
 #include <sys/types.h>
diff --git a/src/rx/test/kstest.c b/src/rx/test/kstest.c
index 5109127..9c68d71 100644
--- a/src/rx/test/kstest.c
+++ b/src/rx/test/kstest.c
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "afs/param.h"
 #include <afsconfig.h>
+#include "afs/param.h"
 
 
 #include <sys/types.h>
diff --git a/src/tests/create-stat.c b/src/tests/create-stat.c
index 1e383a5..acd12e7 100644
--- a/src/tests/create-stat.c
+++ b/src/tests/create-stat.c
@@ -31,12 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <afsconfig.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/tests/snprintf.c b/src/tests/snprintf.c
index 73edbc3..aaed1a7 100644
--- a/src/tests/snprintf.c
+++ b/src/tests/snprintf.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -39,7 +40,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <afsconfig.h>
 
 #ifndef HAVE_VASNPRINTF
 int vasnprintf(char **ret, size_t max_sz, const char *format, va_list args);
diff --git a/src/util/secutil_nt.c b/src/util/secutil_nt.c
index 83a7362..e1d972a 100644
--- a/src/util/secutil_nt.c
+++ b/src/util/secutil_nt.c
@@ -9,8 +9,8 @@
 
 /* Security related utilities for the Windows platform */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 #include <afs/stds.h>
 
 #include <stddef.h>
-- 
1.9.4