From: Love Hörnquist-Åstrand <lha@stacken.kth.se>
Date: Thu, 13 Feb 2003 06:58:31 +0000 (+0000)
Subject: pam-header-ordering-cleanup-20030213
X-Git-Tag: openafs-devel-1_3_50~383
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8ad0977e0cca4cb526eecd019c8afe96b55bb2fe;p=packages%2Fo%2Fopenafs.git

pam-header-ordering-cleanup-20030213

FIXES 1298

so pam module compiles on modern freebsd (system headers before pam)
---

diff --git a/src/pam/afs_auth.c b/src/pam/afs_auth.c
index 442d65a1d..8206c9ff9 100644
--- a/src/pam/afs_auth.c
+++ b/src/pam/afs_auth.c
@@ -12,21 +12,24 @@
 
 RCSID("$Header$");
 
-#include <security/pam_appl.h>
-#include <security/pam_modules.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/param.h>
+#include <sys/wait.h>
 #include <afs/kautils.h>
-#include "afs_message.h"
-#include "afs_util.h"
 #include <signal.h>
-#include <sys/wait.h>
 #include <errno.h>
 
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
+
+#include "afs_message.h"
+#include "afs_util.h"
+
+
 #define RET(x) { retcode = (x); goto out; }
 
 extern int
diff --git a/src/pam/afs_message.c b/src/pam/afs_message.c
index b2e083017..52a064cfc 100644
--- a/src/pam/afs_message.c
+++ b/src/pam/afs_message.c
@@ -7,8 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <security/pam_appl.h>
-#include <security/pam_modules.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +15,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
+
 RCSID("$Header$");
 
 #include <sys/param.h>
diff --git a/src/pam/afs_password.c b/src/pam/afs_password.c
index d113af70f..6a3521220 100644
--- a/src/pam/afs_password.c
+++ b/src/pam/afs_password.c
@@ -7,8 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <security/pam_appl.h>
-#include <security/pam_modules.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +15,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
+
 RCSID("$Header$");
 
 #include <sys/param.h>
diff --git a/src/pam/afs_session.c b/src/pam/afs_session.c
index b2b584adf..f3622949a 100644
--- a/src/pam/afs_session.c
+++ b/src/pam/afs_session.c
@@ -12,13 +12,15 @@
 
 RCSID("$Header$");
 
-#include <security/pam_appl.h>
-#include <security/pam_modules.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
+
 #include "afs_message.h"
 #include "afs_util.h"
 
diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c
index ee3310e59..db857bdbe 100644
--- a/src/pam/afs_setcred.c
+++ b/src/pam/afs_setcred.c
@@ -7,8 +7,6 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <security/pam_appl.h>
-#include <security/pam_modules.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,6 +16,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
+
 RCSID("$Header$");
 
 #include <sys/param.h>