Relevant BUGIDs: none

Purpose of commit: cleanup

Commit summary:
---------------

Rename _pam_aconf.h to config.h.

CHANGELOG

@@ -69,6 +69,7 @@ BerliOS Bugs are marked with (BerliOS #XXXX).
 * configure.in: Fix AC_DEFINE usage for autoheader (kukuk)
 * configure.in/_pam_aconf.h.in: Remove feature.h inclusion (kukuk)
 * defs: Remove obsolete directory/content (kukuk)
+* Rename _pam_aconf.h.in to config.h (kukuk)
 
 0.80: Wed Jul 13 13:23:20 CEST 2005
 * pam_tally: test for NULL data before dereferencing them (t8m)

Makefile

@@ -18,12 +18,12 @@ THINGSTOMAKE = libpam libpamc libpam_misc modules doc examples
 all: $(THINGSTOMAKE)
 
  # Let's get a dynamic libpam.so first
- bootstrap-libpam: _pam_aconf.h prep
+ bootstrap-libpam: config.h prep
 	$(MAKE) -C libpam bootstrap-libpam
 
 prep:
 	rm -f security
-	ln -sf . security
+#	ln -sf . security
 
 clean:
 	if [ ! -f Make.Rules ]; then touch Make.Rules ; fi
@@ -31,19 +31,19 @@ clean:
 	rm -f security *~ *.orig *.rej #*#
 
 distclean: clean
-	rm -f Make.Rules _pam_aconf.h
+	rm -f Make.Rules config.h
 	rm -f config.status config.cache config.log core
 	rm -rf autom4te.cache/
 
 maintainer-clean: distclean
 	@echo files should be ok for packaging now.
 
-# NB _pam_aconf.h.in changes will remake this too
-Make.Rules: configure Make.Rules.in _pam_aconf.h.in
+# NB config.h.in changes will remake this too
+Make.Rules: configure Make.Rules.in config.h.in
 	./config.status --recheck
 	./config.status
 
-_pam_aconf.h: Make.Rules
+config.h: Make.Rules
 
 configure: configure.in
 	@echo
@@ -53,14 +53,14 @@ configure: configure.in
 	@rm -f configure
 	@exit 1
 
-$(THINGSTOMAKE): _pam_aconf.h prep bootstrap-libpam
+$(THINGSTOMAKE): config.h prep bootstrap-libpam
 	$(MAKE) -C $@ all
 
-install: _pam_aconf.h prep
+install: config.h prep
 	for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x install ; done
 
 remove:
-	rm -f $(FAKEROOT)$(INCLUDED)/_pam_aconf.h
+	rm -f $(FAKEROOT)$(INCLUDED)/config.h
 	for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x remove ; done
 
 release:

config.h.in

@@ -1,4 +1,4 @@
-/* _pam_aconf.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
 /* lots of stuff gets written to /tmp/pam-debug.log */
 #undef DEBUG

configure

@@ -1314,7 +1314,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-          ac_config_headers="$ac_config_headers _pam_aconf.h"
+          ac_config_headers="$ac_config_headers config.h"
 
 
 
@@ -8142,7 +8142,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Make.Rules" ) CONFIG_FILES="$CONFIG_FILES Make.Rules" ;;
-  "_pam_aconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS _pam_aconf.h" ;;
+  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;

configure.in

@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(conf/pam_conv1/pam_conv.y)
 
 dnl The configuration header file
-AC_CONFIG_HEADER(_pam_aconf.h)
+AC_CONFIG_HEADER(config.h)
 
 dnl
 dnl Release specific

examples/xsh.c

@@ -5,7 +5,7 @@
 /* Andrew Morgan (morgan@kernel.org) -- an example application
  * that invokes a shell, based on blank.c */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

libpam/pam_private.h

@@ -16,7 +16,7 @@
 #ifndef _PAM_PRIVATE_H
 #define _PAM_PRIVATE_H
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 /* this is not used at the moment --- AGM */
 #define LIBPAM_VERSION (LIBPAM_VERSION_MAJOR*0x100 + LIBPAM_VERSION_MINOR)

libpam_misc/misc_conv.c

@@ -6,7 +6,7 @@
  * Written by Andrew Morgan <morgan@linux.kernel.org>
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <signal.h>
 #include <stdio.h>

modules/pam_access/pam_access.c

@@ -25,7 +25,7 @@
  *************************************************************************
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_cracklib/pam_cracklib.c

@@ -35,7 +35,7 @@
  * S.A.G. in the section on the cracklib module.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #ifdef HAVE_CRYPT_H

modules/pam_env/pam_env.c

@@ -15,7 +15,7 @@
 #define DEFAULT_ETC_ENVFILE     "/etc/environment"
 #define DEFAULT_READ_ENVFILE    0
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <ctype.h>
 #include <errno.h>

modules/pam_filter/pam_filter.c

@@ -5,7 +5,7 @@
  * Richard Stevens' UNIX Network Programming book.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <syslog.h>

modules/pam_filter/upperLOWER/upperLOWER.c

@@ -7,7 +7,7 @@
  * it serves no purpose other than to annoy the user...
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #ifdef MEMORY_DEBUG
 # undef exit

modules/pam_ftp/pam_ftp.c

@@ -14,7 +14,7 @@
 /* the following is a password that "can't be correct" */
 #define BLOCK_PASSWORD "\177BAD PASSWPRD\177"
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_group/pam_group.c

@@ -13,6 +13,8 @@ static const char rcsid[] =
 
 #define _BSD_SOURCE
 
+#include "config.h"
+
 #include <sys/file.h>
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_issue/pam_issue.c

@@ -17,6 +17,8 @@
 #define _GNU_SOURCE
 #define _BSD_SOURCE
 
+#include "config.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_lastlog/pam_lastlog.c

@@ -10,7 +10,7 @@
  * present (login) service.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <fcntl.h>
 #include <time.h>

modules/pam_limits/pam_limits.c

@@ -17,7 +17,7 @@
 #error THIS CODE IS KNOWN TO WORK ONLY ON LINUX !!!
 #endif
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <unistd.h>

modules/pam_listfile/pam_listfile.c

@@ -10,7 +10,7 @@
  * This code began life as the pam_rootok module.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_localuser/pam_localuser.c

@@ -33,7 +33,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../../_pam_aconf.h"
+#include "config.h"
 
 #include <errno.h>
 #include <limits.h>

modules/pam_mail/pam_mail.c

@@ -8,7 +8,7 @@
  * mailhash additions by Chris Adams <cadams@ro.com> 1998/7/11
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <ctype.h>
 #include <pwd.h>

modules/pam_mkhomedir/pam_mkhomedir.c

@@ -28,7 +28,10 @@
  */
 
 /* I want snprintf dammit */
-#define _GNU_SOURCE 1
+#define _GNU_SOURCE
+
+#include "config.h"
+
 #include <stdarg.h>
 #include <sys/types.h>
 #include <sys/stat.h>

modules/pam_motd/pam_motd.c

@@ -10,7 +10,7 @@
  *
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>

modules/pam_pwdb/pam_pwdb.c

@@ -20,7 +20,7 @@ static const char rcsid[] =
 
 /* #define DEBUG */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <sys/types.h>
 #include <stdarg.h>

modules/pam_pwdb/pwdb_chkpwd.c

@@ -13,7 +13,7 @@
  *
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #ifdef MEMORY_DEBUG
 # undef exit

modules/pam_rhosts/pam_rhosts_auth.c

@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #define USER_RHOSTS_FILE "/.rhosts"     /* prefixed by user's home dir */
 

modules/pam_selinux/pam_selinux.c

@@ -38,7 +38,7 @@
  *
  */
 
-#include "../../_pam_aconf.h"
+#include "config.h"
 
 #include <errno.h>
 #include <limits.h>

modules/pam_stress/pam_stress.c

@@ -5,7 +5,7 @@
  * created by Andrew Morgan <morgan@linux.kernel.org> 1996/3/12
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>

modules/pam_tally/pam_tally.c

@@ -14,7 +14,7 @@
  * Audit option added for Tomas patch by Sebastien Tricaud <toady@gscore.org> 13 January 2005
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #if defined(MAIN) && defined(MEMORY_DEBUG)
 # undef exit

modules/pam_time/pam_time.c

@@ -13,7 +13,7 @@ static const char rcsid[] =
 "\t\tVersion 0.22 for Linux-PAM\n"
 "Copyright (C) Andrew G. Morgan 1996 <morgan@linux.kernel.org>\n";
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <sys/file.h>
 #include <stdio.h>

modules/pam_umask/pam_umask.c

@@ -35,7 +35,7 @@
 
 #define _GNU_SOURCE
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <pwd.h>
 #include <grp.h>

modules/pam_unix/pam_unix_acct.c

@@ -34,7 +34,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>

modules/pam_unix/pam_unix_auth.c

@@ -37,7 +37,7 @@
 
 /* #define DEBUG */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_unix/pam_unix_passwd.c

@@ -35,7 +35,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_unix/pam_unix_sess.c

@@ -36,7 +36,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_unix/unix_chkpwd.c

@@ -13,7 +13,7 @@
  *
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #ifdef MEMORY_DEBUG
 # undef exit

modules/pam_unix/yppasswd_xdr.c

@@ -10,7 +10,7 @@
  * editied manually.
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>

modules/pam_userdb/pam_userdb.c

@@ -6,7 +6,7 @@
  * See the end of the file for Copyright Information
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

modules/pam_xauth/pam_xauth.c

@@ -35,7 +35,7 @@
 
 /* "$Id$" */
 
-#include "../../_pam_aconf.h"
+#include "config.h"
 #include <sys/types.h>
 #include <sys/fsuid.h>
 #include <sys/wait.h>

modules/pammodutil/pammodutil.h

@@ -7,7 +7,8 @@
  * Copyright (c) 2001 Andrew Morgan <morgan@kernel.org>
  */
 
-#include <security/_pam_aconf.h>
+#include "config.h"
+
 #include <security/_pam_macros.h>
 #include <security/pam_modules.h>
 #include <security/_pam_modutil.h>