Relevant BUGIDs: 770645

Purpose of commit: cleanup

Commit summary:
---------------
Fix the many compile-time warnings caused by features.h being included
before our _pam_aconf.h.  This should make it much easier to find other
bugs.

Also, call config.status instead of configure, to allow rebuilding
generated files with the same options.

diff --git a/Makefile b/Makefile
index 06c162fd8239aad2e687394e4a5eeed0ad57afa2..d4afd22143913afbbf721b1623dc0fe29e256c9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,8 @@ maintainer-clean: distclean
 
 # NB _pam_aconf.h.in changes will remake this too
 Make.Rules: configure Make.Rules.in _pam_aconf.h.in
-       @echo XXX - not sure how to preserve past configure options..
-       @echo XXX - so not attempting to. Feel free to run ./configure
-       @echo XXX - by hand, with the options you want.
-       ./configure
+       ./config.status --recheck
+       ./config.status
 
 _pam_aconf.h: Make.Rules
 

diff --git a/_pam_aconf.h.in b/_pam_aconf.h.in
index 0569554d5a7da4435154348eb6166a6bf787404d..99294d63efb80abbf92dd02d123045359060c583 100644 (file)
--- a/_pam_aconf.h.in
+++ b/_pam_aconf.h.in
@@ -21,9 +21,6 @@
 #ifdef HAVE_FEATURES_H
 # define _SVID_SOURCE
 # define _BSD_SOURCE
-# define __USE_BSD
-# define __USE_SVID
-# define __USE_MISC
 # define _GNU_SOURCE
 # include <features.h>
 #endif /* HAVE_FEATURES_H */

diff --git a/libpam/pam_account.c b/libpam/pam_account.c
index 71e04f15ccaf85814d7904da18d5d5cbea148de6..3a4fb1fc8c049783346a185c0bcfc7af4b4c1b39 100644 (file)
--- a/libpam/pam_account.c
+++ b/libpam/pam_account.c
@@ -1,9 +1,9 @@
 /* pam_account.c - PAM Account Management */
 
-#include <stdio.h>
-
 #include "pam_private.h"
 
+#include <stdio.h>
+
 int pam_acct_mgmt(pam_handle_t *pamh, int flags)
 {
     int retval;

diff --git a/libpam/pam_auth.c b/libpam/pam_auth.c
index dbbdf00f05bb3f877dbe9efb0aff0c14fe9713cb..c945ebfca77690001494ba7ad158ec2deb9b6973 100644 (file)
--- a/libpam/pam_auth.c
+++ b/libpam/pam_auth.c
@@ -5,11 +5,11 @@
  *
  */
 
+#include "pam_private.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "pam_private.h"
-
 int pam_authenticate(pam_handle_t *pamh, int flags)
 {
     int retval;

diff --git a/libpam/pam_data.c b/libpam/pam_data.c
index 06aa837f9d1bf25b7f2bfd6576863995529c6ec4..2a0ea989683139cd012c3f78f2e6ce85bae615b3 100644 (file)
--- a/libpam/pam_data.c
+++ b/libpam/pam_data.c
@@ -4,11 +4,11 @@
  * $Id$
  */
 
+#include "pam_private.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "pam_private.h"
-
 static struct pam_data *_pam_locate_data(const pam_handle_t *pamh,
                                         const char *name)
 {

diff --git a/libpam/pam_delay.c b/libpam/pam_delay.c
index d38d47bc693a9bf60987c20c0f3bdbe3675d6d3a..a9cfa8028f4c11a89804d3c82808000cbe8f794f 100644 (file)
--- a/libpam/pam_delay.c
+++ b/libpam/pam_delay.c
@@ -13,9 +13,9 @@
  * attempt to overcome authentication-time attacks in a simple manner.
  */
 
+#include "pam_private.h"
 #include <unistd.h>
 #include <time.h>
-#include "pam_private.h"
 
 /* **********************************************************************
  * initialize the time as unset, this is set on the return from the

diff --git a/libpam/pam_dispatch.c b/libpam/pam_dispatch.c
index 3ebdb5ba797972dd4df29e5613bcb26cb4f5022b..c6fcd5f8735bf7e5440df1d8f518d431dcc88aa7 100644 (file)
--- a/libpam/pam_dispatch.c
+++ b/libpam/pam_dispatch.c
@@ -6,11 +6,11 @@
  * $Id$
  */
 
+#include "pam_private.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "pam_private.h"
-
 /*
  * this is the return code we return when a function pointer is NULL
  * or, the handler structure indicates a broken module config line

diff --git a/libpam/pam_end.c b/libpam/pam_end.c
index 735da62eaa86ff58e6eae81a7fb2b8f520353a00..2226eaaeaa2cf3d81c76e64e60890d5add15b8f2 100644 (file)
--- a/libpam/pam_end.c
+++ b/libpam/pam_end.c
@@ -4,10 +4,10 @@
  * $Id$
  */
 
-#include <stdlib.h>
-
 #include "pam_private.h"
 
+#include <stdlib.h>
+
 int pam_end(pam_handle_t *pamh, int pam_status)
 {
     int ret;

diff --git a/libpam/pam_env.c b/libpam/pam_env.c
index 86a2889e0df94506a3686d56a48feb5489d35b8d..d5a26ccba4a0096fe527d30253e2d1a8816f1b71 100644 (file)
--- a/libpam/pam_env.c
+++ b/libpam/pam_env.c
@@ -10,14 +10,15 @@
  * $Id$
  */
 
+#include "pam_private.h"
+
 #include <string.h>
 #include <stdlib.h>
+
 #ifdef sunos
 #define memmove(x,y,z) bcopy(y,x,z)
 #endif
 
-#include "pam_private.h"
-
 /* helper functions */
 
 #ifdef DEBUG

diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c
index 62b7446ccc408a882e24b40b651bc888552ee9e3..b1e956854fc8e7d60dc2f6c2b3aa6dc14c3ab99d 100644 (file)
--- a/libpam/pam_handlers.c
+++ b/libpam/pam_handlers.c
@@ -8,6 +8,8 @@
  *
  */
 
+#include "pam_private.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -24,8 +26,6 @@
 # endif /* PAM_SHL */
 #endif /* PAM_DYNAMIC */
 
-#include "pam_private.h"
-
 /* If not required, define as nothing */
 #ifndef SHLIB_SYM_PREFIX
 # define SHLIB_SYM_PREFIX ""

diff --git a/libpam/pam_item.c b/libpam/pam_item.c
index 2b4c32ef08dc7da0d80179746adf246473bbcd16..476864114c9c1c7a597db947643a2970f5e80225 100644 (file)
--- a/libpam/pam_item.c
+++ b/libpam/pam_item.c
@@ -4,13 +4,13 @@
  * $Id$
  */
 
+#include "pam_private.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 
-#include "pam_private.h"
-
 #define RESET(X, Y)                    \
 {                                      \
     char *_TMP_ = (X);                 \

diff --git a/libpam/pam_misc.c b/libpam/pam_misc.c
index bd4ed958d8811705d3b88840fb0ad320acfef6f7..796656d4a85434f9e7b21a2a0cb4149e692f0204 100644 (file)
--- a/libpam/pam_misc.c
+++ b/libpam/pam_misc.c
@@ -4,6 +4,8 @@
  * $Id$
  */
 
+#include "pam_private.h"
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -11,8 +13,6 @@
 #include <syslog.h>
 #include <ctype.h>
 
-#include "pam_private.h"
-
 /* caseless string comparison: POSIX does not define this.. */
 int _pam_strCMP(const char *s, const char *t)
 {

diff --git a/libpam/pam_password.c b/libpam/pam_password.c
index 8e36971eba1beef9c0140e48cd09feba986b549e..bfe410290c1d08f7f965e5b39186327c92dbc526 100644 (file)
--- a/libpam/pam_password.c
+++ b/libpam/pam_password.c
@@ -4,13 +4,13 @@
  * $Id$
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 /* #define DEBUG */
 
 #include "pam_private.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 int pam_chauthtok(pam_handle_t *pamh, int flags)
 {
     int retval;

diff --git a/libpam/pam_session.c b/libpam/pam_session.c
index 16b021df0a016f76027732d95cb974210fa1d93a..98125ba649412b87c5e3f19a033a41b5c7d17b1c 100644 (file)
--- a/libpam/pam_session.c
+++ b/libpam/pam_session.c
@@ -4,10 +4,10 @@
  * $Id$
  */
 
-#include <stdio.h>
-
 #include "pam_private.h"
 
+#include <stdio.h>
+
 int pam_open_session(pam_handle_t *pamh, int flags)
 {
     D(("called"));

diff --git a/libpam/pam_start.c b/libpam/pam_start.c
index 7febeb8df1818eec1e4179b26de070670655bcd4..ef1dae1dd823fb3e6a72978179829f7f5ce773b7 100644 (file)
--- a/libpam/pam_start.c
+++ b/libpam/pam_start.c
@@ -7,14 +7,14 @@
  *
  */
 
+#include "pam_private.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <syslog.h>
 
-#include "pam_private.h"
-
 int pam_start (
     const char *service_name,
     const char *user,

diff --git a/modules/pammodutil/modutil_getlogin.c b/modules/pammodutil/modutil_getlogin.c
index b624def12d42d25382614a664e8e838bd6148b28..28616337f93e56273bd5461898a97802528ba818 100644 (file)
--- a/modules/pammodutil/modutil_getlogin.c
+++ b/modules/pammodutil/modutil_getlogin.c
@@ -6,12 +6,12 @@
  * there.
  */
 
+#include "pammodutil.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <utmp.h>
 
-#include "pammodutil.h"
-
 #define _PAMMODUTIL_GETLOGIN "_pammodutil_getlogin"
 
 const char *_pammodutil_getlogin(pam_handle_t *pamh)