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 442d65a1d56cc4daad4da418c8a65dee6395e7bf..8206c9ff9d343dde46c130ace69cd5c15db061e9 100644 (file)
--- 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 b2e083017cf0214c0d88d2aa110b51f0fc4313e4..52a064cfc3d3f75bf60e14517cf20f8d0da9fbac 100644 (file)
--- 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 d113af70f22558050507767f24a832287fdf44f1..6a3521220cc2f4dcd1cd77de9be22ec6f781037c 100644 (file)
--- 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 b2b584adfadd9e939a873cfdfedfceaf91d857a1..f3622949ab679690a5e1978ee3f21ae2723d3bff 100644 (file)
--- 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 ee3310e59a86520106989795d6be3b99ec76308c..db857bdbea02534b3b210f9966ca4b5d86c92f73 100644 (file)
--- 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>