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.

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
 

_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 */

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;

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;

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)
 {

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

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

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;

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

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 ""

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);                 \

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)
 {

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;

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"));

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,

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)