Update

git-svn-id: file:///svnroot/pam-modules/trunk@91 56984be4-0537-0410-a56c-fcb268c96130

3 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f4f8b2f..0fbaa1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-03-19  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+	* configure.ac: Check for pam libraries and header files.
+	* pam_sql/pam_mysql.c (mysql_setenv): Protect by #ifdef
+	HAVE_PAM_MISC_SETENV.  Prevent coredumps on NULL values.
+	* pam_sql/pam_pgsql.c (pgsql_setenv): Likewise.
+	* pam_sql/Makefile.am (pam_mysql_la_LDADD,pam_pgsql_la_LDADD): Add
+	@PAM_MISC@.
+	* pam_sql/pam_sql.c (read_config): Read lines of arbitrary length.
+
 	* pam_sql/pam_mysql.c, pam_sql/pam_pgsql.c: Implement `setenv'
 	method.
 	* pam_sql/pam_sql.c, pam_fshadow/pam_fshadow (_pam_get_password):
@@ -19,7 +27,7 @@
 
 	* NEWS, configure.ac: Updated. Set version to 1.3.90.
 	
-	* lib/escape.c lib/vartab.c: New files.
+	* lib/escape.c, lib/vartab.c: New files.
 	* lib/graypam.h (gray_expand_argv)
 	(gray_expand_string, gray_escape_string): New functions.
 	(struct keyword): New declaration.
diff --git a/NEWS b/NEWS
index 5589834..65fba9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-pam-modules -- history of user-visible changes. 2008-03-17
+pam-modules -- history of user-visible changes. 2008-03-19
 Copyright (C) 2001,2004,2005,2007,2008 Sergey Poznyakoff
 See the end of file for copying conditions.
 
@@ -19,6 +19,9 @@ Old style of variable expansion has been dropped.  The `$name'
 notation is used instead.  To convert your old configuration files,
 replace %u with $user, and %p with $password.
 
+** setenv-query
+
+This new query allows to store arbitrary data in PAM environment.
 
 
 Version 1.3, 2008-03-15
diff --git a/doc/pam-modules.texi b/doc/pam-modules.texi
index 8371d4a..b678814 100644
--- a/doc/pam-modules.texi
+++ b/doc/pam-modules.texi
@@ -595,6 +595,16 @@ subject to variable expansion (@pxref{variable expansion}).
 Defines the query to be executed on session stop.  The @var{query} is
 subject to variable expansion (@pxref{variable expansion}).
 
+@opindex setenv-query, @command{pam_mysql} configuration variable
+@opindex setenv-query, @command{pam_pgsql} configuration variable
+@item setenv-query @var{query}
+This query is available when the package is compiled with @code{Linux
+PAM} implementation.  It allows to select arbitrary data from the
+database and to store them in @acronym{PAM} environment.  The
+first tuple returned from @var{query} is selected, the column names
+are used as environment variable names, and column values as their
+values. 
+
 @cindex allow-plaintext-pass, @command{pam_pgsql} configuration variable
 @cindex allow-plaintext-pass, @command{pam_mysql} configuration variable
 @item allow-plaintext-pass @var{bool}