Version 2.0release-2.0

* NEWS: Update version number
* configure.ac: Likewise.
* doc/pam-modules.texi: Fix a typo.
* doc/pam_ldaphome.8in: Likewise.
* pamck/pamck.c: Update copyright years.

* pam_fshadow/pam_fshadow.c: Suppress cc warnings.
* pam_groupmember/pam_groupmember.c: Likewise.
* pam_ldaphome/pam_ldaphome.c: Likewise.
* pam_log/pam_log.c: Likewise.
* pam_regex/pam_regex.c: Likewise.

10 files changed, 36 insertions, 24 deletions

diff --git a/NEWS b/NEWS
index 79dbb71..7d24ab6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-pam-modules -- history of user-visible changes. 2015-01-30
+pam-modules -- history of user-visible changes. 2015-02-26
 Copyright (C) 2001, 2004-2005, 2007-2012, 2015 Sergey Poznyakoff
@@ -7,3 +7,3 @@ Please send pam-modules bug reports to <bug-pam-modules@gnu.org.ua>
 
-Version 1.9.90 (Git)
+Version 2.0, 2015-02-26
 
@@ -34,2 +34,10 @@ then the line '#:user' can be used to delimit ldap-synchronized
 and user-specific keys.
+
+* audit option
+
+All modules now support 'audit' option, which is equivalent to
+debug=100, i.e. it enables logging maximum debugging output.
+
+* pam_fshadow is built on all systems
+
 
diff --git a/configure.ac b/configure.ac
index 70c5b74..3a192a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,3 +18,3 @@ AC_PREREQ(2.63)
 
-AC_INIT(pam-modules, 1.9.90, bug-pam-modules@gnu.org.ua)
+AC_INIT(pam-modules, 2.0, bug-pam-modules@gnu.org.ua)
 AC_CONFIG_SRCDIR(pam_fshadow/pam_fshadow.c)
diff --git a/doc/pam-modules.texi b/doc/pam-modules.texi
index a37a8ae..1464e06 100644
--- a/doc/pam-modules.texi
+++ b/doc/pam-modules.texi
@@ -1217,3 +1217,3 @@ In general, all statements defined below can appear in both files.
 However, since @file{/etc/ldap.conf} is read by other system utilities
-as well, we do not recomment using @command{pam_ldaphome}-specific
+as well, we do not recommend using @command{pam_ldaphome}-specific
 keywords in it.
diff --git a/doc/pam_ldaphome.8in b/doc/pam_ldaphome.8in
index 01b0a1c..ace334a 100644
--- a/doc/pam_ldaphome.8in
+++ b/doc/pam_ldaphome.8in
@@ -16,3 +16,3 @@
 .so config.so
-.TH PAM_LDAPHOME 8 "January 30, 2015" "PAM-MODULES" "Pam-Modules User Reference"
+.TH PAM_LDAPHOME 8 "February 26, 2015" "PAM-MODULES" "Pam-Modules User Reference"
 .SH NAME
@@ -52,3 +52,3 @@ all statements defined below can appear in both files.  However, since
 .B /etc/ldap.conf
-is read by other system utilities as well, we do not recomment using
+is read by other system utilities as well, we do not recommend using
 .BR pam_ldaphome -specific 
diff --git a/pam_fshadow/pam_fshadow.c b/pam_fshadow/pam_fshadow.c
index 3a9bcda..058dd44 100644
--- a/pam_fshadow/pam_fshadow.c
+++ b/pam_fshadow/pam_fshadow.c
@@ -126,15 +126,17 @@ struct pam_opt pam_opt[] = {
 	{ PAM_OPTSTR(extended), pam_opt_bitmask, &regex_flags,
-	  REG_EXTENDED },
+	  { .value = REG_EXTENDED } },
 	{ PAM_OPTSTR(basic), pam_opt_bitmask_rev, &regex_flags,
-	  REG_EXTENDED },
+	  { .value = REG_EXTENDED } },
 	{ PAM_OPTSTR(icase), pam_opt_bitmask, &regex_flags,
-	  REG_ICASE },
+	  { .value = REG_ICASE } },
 	{ PAM_OPTSTR(ignore-case), pam_opt_bitmask, &regex_flags,
-	  REG_ICASE },
+	  { .value = REG_ICASE } },
 	{ PAM_OPTSTR(case), pam_opt_bitmask_rev, &regex_flags,
-	  REG_ICASE },
-	{ PAM_OPTSTR(passwd), pam_opt_bool, &cntl_flags, CNTL_PASSWD },
-	{ PAM_OPTSTR(shadow), pam_opt_bool, &cntl_flags, CNTL_SHADOW },
+	  { .value = REG_ICASE } },
+	{ PAM_OPTSTR(passwd), pam_opt_bool, &cntl_flags,
+	  { .value = CNTL_PASSWD } },
+	{ PAM_OPTSTR(shadow), pam_opt_bool, &cntl_flags,
+	  { .value = CNTL_SHADOW } },
 	{ PAM_OPTSTR(revert-index), pam_opt_bool, &cntl_flags,
-	  CNTL_REVERT_INDEX },
+	  { .value = CNTL_REVERT_INDEX } },
  	{ NULL }
diff --git a/pam_groupmember/pam_groupmember.c b/pam_groupmember/pam_groupmember.c
index 39685b0..020c900 100644
--- a/pam_groupmember/pam_groupmember.c
+++ b/pam_groupmember/pam_groupmember.c
@@ -42,3 +42,2 @@ const char *sense_choice[] = { "allow", "deny", NULL };
 static int sense;
-static int cntl_flags;
 static long debug_level;
diff --git a/pam_ldaphome/pam_ldaphome.c b/pam_ldaphome/pam_ldaphome.c
index c80f1dc..b1403cb 100644
--- a/pam_ldaphome/pam_ldaphome.c
+++ b/pam_ldaphome/pam_ldaphome.c
@@ -630,2 +630,6 @@ get_ldap_attrs(LDAP *ld, LDAPMessage *msg, const char *attr)
 	rc = ldap_get_dn_ber(ld, msg, &ber, &bv);
+	if (rc != LDAP_SUCCESS) {
+		_pam_log(LOG_ERR, "ldap_get_dn_ber: %s", ldap_err2string(rc));
+		return NULL;
+	}
 	ufn = ldap_dn2ufn(bv.bv_val);
diff --git a/pam_log/pam_log.c b/pam_log/pam_log.c
index adb296d..8a76f3f 100644
--- a/pam_log/pam_log.c
+++ b/pam_log/pam_log.c
@@ -20,3 +20,2 @@
 /* Command line parsing */
-static int cntl_flags;
 static long debug_level;
diff --git a/pam_regex/pam_regex.c b/pam_regex/pam_regex.c
index cbb7431..3f14510 100644
--- a/pam_regex/pam_regex.c
+++ b/pam_regex/pam_regex.c
@@ -45,3 +45,2 @@ const char *sense_choice[] = { "allow", "deny", NULL };
 static int sense;
-static int cntl_flags;
 static long debug_level;
@@ -58,3 +57,4 @@ struct pam_opt pam_opt[] = {
 	  gray_wait_debug_fun },
-	{ PAM_OPTSTR(sense), pam_opt_enum, &sense, { sense_choice } },
+	{ PAM_OPTSTR(sense), pam_opt_enum, &sense,
+	  { .enumstr = sense_choice } },
 	{ PAM_OPTSTR(transform), pam_opt_string, &transform },
@@ -63,11 +63,11 @@ struct pam_opt pam_opt[] = {
 	{ PAM_OPTSTR(extended), pam_opt_bitmask, &regex_flags,
-	  { REG_EXTENDED } },
+	  { .value = REG_EXTENDED } },
 	{ PAM_OPTSTR(basic), pam_opt_bitmask_rev, &regex_flags,
-	  { REG_EXTENDED } },
+	  { .value = REG_EXTENDED } },
 	{ PAM_OPTSTR(icase), pam_opt_bitmask, &regex_flags,
-	  { REG_ICASE } },
+	  { .value = REG_ICASE } },
 	{ PAM_OPTSTR(ignore-case), pam_opt_bitmask, &regex_flags,
-	  { REG_ICASE } },
+	  { .value = REG_ICASE } },
 	{ PAM_OPTSTR(case), pam_opt_bitmask_rev, &regex_flags,
-	  { REG_ICASE } },
+	  { .value = REG_ICASE } },
 	
diff --git a/pamck/pamck.c b/pamck/pamck.c
index 55e744c..976c1da 100644
--- a/pamck/pamck.c
+++ b/pamck/pamck.c
@@ -41,3 +41,3 @@ version()
 	fputs ("\
-Copyright (C) 2009-2012, 2014 Sergey Poznyakoff\n\
+Copyright (C) 2009-2015 Sergey Poznyakoff\n\
 \n\