Relevant BUGIDs:

Purpose of commit: new feature

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

2006-08-31  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_env/environment: New, dummy environment example
        config file.

diff --git a/ChangeLog b/ChangeLog
index 748d69536d3b0e0856c38b8962b1567cca575436..7871b3b4706946ddc051893473c5b76bd06ababd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-31  Thorsten Kukuk  <kukuk@thkukuk.de>
 
+       * modules/pam_env/environment: New, dummy environment example
+       config file.
+
        * modules/pam_namespace/Makefile.am: Don't install
        manual page if we don't build module.
 

diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index 287e2534cd1b0b909b4b07bc70b88af71c0623ca..83236e9b94c9b5c18d2f418cae899d8bb7a8fd15 100644 (file)
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -4,7 +4,7 @@
 
 CLEANFILES = *~
 
-EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env
+EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment
 
 man_MANS = pam_env.conf.5 pam_env.8
 
@@ -24,6 +24,7 @@ endif
 securelib_LTLIBRARIES = pam_env.la
 
 secureconf_DATA = pam_env.conf
+sysconf_DATA = environment
 
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README

diff --git a/modules/pam_env/environment b/modules/pam_env/environment
new file mode 100644 (file)
index 0000000..f46b8d9
--- /dev/null
+++ b/modules/pam_env/environment
@@ -0,0 +1,5 @@
+#
+# This file is parsed by pam_env module
+#
+# Syntax: simple "KEY=VAL" pairs on seperate lines
+#

diff --git a/modules/pam_env/pam_env.conf b/modules/pam_env/pam_env.conf
index 02116639621974ced066dbc72a6d49ea42178a73..d0ba35c2a13caa799a857dd46bdb91750812a83a 100644 (file)
--- a/modules/pam_env/pam_env.conf
+++ b/modules/pam_env/pam_env.conf
@@ -1,6 +1,3 @@
-# $Date$
-# $Author$
-# $Id$
 #
 # This is the configuration file for pam_env, a PAM module to load in 
 # a configurable list of environment variables for a