New module pam_innetgr.

* Makefile.am: Add new module.
* NEWS: Upgrade
* configure.ac: Add configuration for pam_innetgr
* pam_innetgr/Makefile.am: New file.
* pam_innetgr/pam_innetgr.c: New file.
* doc/Makefile.am: Add pam_innetgr.8
* doc/pam-modules.texi: Document pam_innetgr.
* doc/pam_innetgr.8: New file.
* examples/ldappubkey: Bugfixes
(publickeyattribute setting): Accept a list of attributes
(publickeyfilter): New setting.

11 files changed, 735 insertions, 45 deletions

diff --git a/Makefile.am b/Makefile.am
index 0b5c6d5..f2f416b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,37 +17,35 @@
 AUTOMAKE_OPTIONS = gnits 1.8
 ACLOCAL_AMFLAGS = -I m4 -I imprimatur
 
+SUBDIRS = \
+ imprimatur\
+ doc\
+ examples\
+ lib\
+ pam_sql\
+ pamck
+
 if PAM_COND_FSHADOW
-  FSHADOW_DIR=pam_fshadow
+  SUBDIRS += pam_fshadow
 endif
 if PAM_COND_REGEX
-  REGEX_DIR=pam_regex
+  SUBDIRS += pam_regex
 endif
 if PAM_COND_LOG
-  LOG_DIR=pam_log
+  SUBDIRS += pam_log
 endif
 if PAM_COND_LDAPHOME
-  LDAPHOME_DIR=pam_ldaphome
+  SUBDIRS += pam_ldaphome
 endif
 if PAM_COND_UMOTD
-  UMOTD_DIR=pam_umotd
+  SUBDIRS += pam_umotd
 endif
 if PAM_COND_GROUPMEMBER
-  GROUPMEMBER_DIR=pam_groupmember
+  SUBDIRS += pam_groupmember
+endif
+if PAM_COND_INNETGR
+  SUBDIRS += pam_innetgr
 endif
-SUBDIRS = \
- imprimatur\
- doc\
- examples\
- lib\
- $(FSHADOW_DIR)\
- $(REGEX_DIR)\
- $(LOG_DIR)\
- pam_sql\
- $(LDAPHOME_DIR)\
- $(UMOTD_DIR)\
- $(GROUPMEMBER_DIR)\
- pamck
 
 EXTRA_DIST=ChangeLog.svn
 
diff --git a/NEWS b/NEWS
index 0a530e2..22ba9df 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,25 @@
-pam-modules -- history of user-visible changes. 2018-01-02
-Copyright (C) 2001, 2004-2005, 2007-2012, 2015, 2018 Sergey Poznyakoff
+pam-modules -- history of user-visible changes. 2018-08-12
 See the end of file for copying conditions.
 
 Please send pam-modules bug reports to <bug-pam-modules@gnu.org.ua>
 
+Version 2.2.90 (git)
+
+* New module pam_innetgr
+
+This module checks if the current hostname and the name of the user
+trying to log in are mentioned in a triple of the specified NIS
+netgroup.
+
+* The ldappubkey utility imporoved.
+
+The PublicKeyAttribute setting accepts a whitespace-separated list of
+attribute names.
+
+The new setting PublicKeyFilter can be used to supply a LDAP filter
+expression to use in place of the default.
+
+
 Version 2.2, 2018-01-02
 
 * Improve pam_fshadow
@@ -223,7 +239,7 @@ Version 0.1
 =========================================================================
 Copyright information:
 
-Copyright (C) 2001, 2004-2005, 2007-2015 Sergey Poznyakoff
+Copyright (C) 2001, 2004-2005, 2007-2012, 2015, 2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/configure.ac b/configure.ac
index 0a4eb33..6869248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT(pam-modules, 2.2, bug-pam-modules@gnu.org.ua)
+AC_INIT(pam-modules, 2.2.90, bug-pam-modules@gnu.org.ua)
 AC_CONFIG_SRCDIR(pam_fshadow/pam_fshadow.c)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -171,6 +171,18 @@ yes)
 esac
 ])
 
+#
+AC_CHECK_FUNCS([getdomainname])
+PM_ENABLE(innetgr,[
+case $build_innetgr in
+probe)
+  AC_CHECK_FUNC([innetgr],[build_innetgr=yes],[build_innetgr=no])
+  ;;
+yes)
+  AC_CHECK_FUNC([innetgr],[],[AC_MSG_ERROR([cannot build the requested module pam_innetgr because function innetgr is not present in libc])])
+  ;;
+esac])
+
 ## *****************
 ## debugging support
 ## *****************
@@ -219,7 +231,7 @@ delim="-------------------------------------------------------------------"
 echo $delim | tr '-' '*'
 echo "Modules to build:"
 res=
-for module in fshadow regex log pgsql mysql ldaphome umotd groupmember
+for module in fshadow regex log pgsql mysql ldaphome umotd groupmember innetgr
 do
         modname=pam_$module
         eval enable=\${build_$module}
@@ -242,7 +254,8 @@ build_pgsql=$build_pgsql
 build_mysql=$build_mysql
 build_ldaphome=$build_ldaphome
 build_umotd=$build_umotd
-build_groupmember=$build_groupmember])
+build_groupmember=$build_groupmember
+build_innetgr=$build_innetgr])
                 
 AC_OUTPUT(Makefile
           doc/Makefile
@@ -255,4 +268,5 @@ AC_OUTPUT(Makefile
           pam_ldaphome/Makefile
           pam_umotd/Makefile
           pam_groupmember/Makefile
+          pam_innetgr/Makefile
           pamck/Makefile)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3d588e3..368d3b0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -43,6 +43,9 @@ endif
 if PAM_COND_GROUPMEMBER
   dist_man_MANS += pam_groupmember.8
 endif
+if PAM_COND_INNETGR
+  dist_man_MANS += pam_innetgr.8
+endif
 
 config.so: $(top_srcdir)/configure.ac $(top_srcdir)/doc/Makefile.am
         $(AM_V_GEN){\
diff --git a/doc/pam-modules.texi b/doc/pam-modules.texi
index 31f69ed..840a4c1 100644
--- a/doc/pam-modules.texi
+++ b/doc/pam-modules.texi
@@ -31,10 +31,11 @@
                                        session management.
 * pam_log:     (pam-modules)log.       Format and log arbitrary
                                        messages to syslog.
-* pam_ldaphome (pam-modules)ldaphome   Maintain home directories and
+* pam_ldaphome (pam-modules)ldaphome.  Maintain home directories and
                                        SSH keys od LDAP users.
-* pam_umotd    (pam-modules)umotd      Display a user-specific MOTD.
-* pam_groupmember (pam_modules)groupmember Test group membership.
+* pam_umotd    (pam-modules)umotd.     Display a user-specific MOTD.
+* pam_groupmember (pam_modules)groupmember. Test group membership.
+* pam_innetgr  (pam-modules)innetgr.   Check NIS netgroup.
 * pamck:       (pam-modules)pamck.     Verify PAM Access.
 * usergitconfig: (pam-modules)usergitconfig.  Initialize user @file{.gitconfig} file.
 * ldappubkey:    (pam-modules)ldappubkey.     Get user's public ssh keys from the LDAP database.
@@ -90,6 +91,7 @@ Individual modules
 * ldaphome::            Maintain home directories and SSH keys of LDAP users.
 * umotd::               Display a user-specific MOTD.
 * groupmember::         Test group membership.
+* innetgr::             Check NIS netgroup.
 
 * Reporting Bugs::      How to Report a Bug.
 
@@ -1670,11 +1672,33 @@ LDAP record is searched using the following filter:
 @end example
 @end deffn
 
-@deffn {ldap.conf} publickeyattribute @var{attr}
+@deffn {ldap.conf} publickeyattribute @var{attr} [@var{attr}...]