From 183f34ed270bc401188076fba89074c7aa2cee71 Mon Sep 17 00:00:00 2001 From: des Date: Mon, 1 May 2017 15:02:58 +0000 Subject: [PATCH 01/16] Vendor import of OpenPAM Resedacea. --- HISTORY | 20 ++ Makefile.am | 2 +- Makefile.in | 4 +- RELNOTES | 4 +- autogen.sh | 2 +- bin/Makefile.am | 2 +- bin/Makefile.in | 2 +- bin/openpam_dump_policy/Makefile.am | 2 +- bin/openpam_dump_policy/Makefile.in | 2 +- bin/openpam_dump_policy/openpam_dump_policy.c | 2 +- bin/pamtest/Makefile.am | 2 +- bin/pamtest/Makefile.in | 2 +- bin/pamtest/pamtest.1 | 6 +- bin/pamtest/pamtest.c | 2 +- bin/su/Makefile.am | 2 +- bin/su/Makefile.in | 2 +- bin/su/su.1 | 6 +- bin/su/su.c | 2 +- configure | 22 +-- configure.ac | 6 +- doc/Makefile.am | 2 +- doc/Makefile.in | 2 +- doc/man/Makefile.am | 2 +- doc/man/Makefile.in | 2 +- doc/man/openpam.3 | 4 +- doc/man/openpam.man | 2 +- doc/man/openpam_borrow_cred.3 | 6 +- doc/man/openpam_free_data.3 | 4 +- doc/man/openpam_free_envlist.3 | 4 +- doc/man/openpam_get_feature.3 | 10 +- doc/man/openpam_get_option.3 | 4 +- doc/man/openpam_log.3 | 4 +- doc/man/openpam_nullconv.3 | 6 +- doc/man/openpam_readline.3 | 4 +- doc/man/openpam_readlinev.3 | 4 +- doc/man/openpam_readword.3 | 4 +- doc/man/openpam_restore_cred.3 | 6 +- doc/man/openpam_set_feature.3 | 10 +- doc/man/openpam_set_option.3 | 6 +- doc/man/openpam_straddch.3 | 4 +- doc/man/openpam_subst.3 | 8 +- doc/man/openpam_ttyconv.3 | 6 +- doc/man/pam.3 | 12 +- doc/man/pam.conf.5 | 6 +- doc/man/pam.man | 2 +- doc/man/pam_acct_mgmt.3 | 6 +- doc/man/pam_authenticate.3 | 12 +- doc/man/pam_chauthtok.3 | 12 +- doc/man/pam_close_session.3 | 12 +- doc/man/pam_conv.3 | 6 +- doc/man/pam_end.3 | 12 +- doc/man/pam_error.3 | 6 +- doc/man/pam_get_authtok.3 | 10 +- doc/man/pam_get_data.3 | 6 +- doc/man/pam_get_item.3 | 10 +- doc/man/pam_get_user.3 | 8 +- doc/man/pam_getenv.3 | 4 +- doc/man/pam_getenvlist.3 | 4 +- doc/man/pam_info.3 | 6 +- doc/man/pam_open_session.3 | 12 +- doc/man/pam_prompt.3 | 6 +- doc/man/pam_putenv.3 | 6 +- doc/man/pam_set_data.3 | 6 +- doc/man/pam_set_item.3 | 12 +- doc/man/pam_setcred.3 | 12 +- doc/man/pam_setenv.3 | 6 +- doc/man/pam_sm_acct_mgmt.3 | 6 +- doc/man/pam_sm_authenticate.3 | 6 +- doc/man/pam_sm_chauthtok.3 | 6 +- doc/man/pam_sm_close_session.3 | 6 +- doc/man/pam_sm_open_session.3 | 6 +- doc/man/pam_sm_setcred.3 | 6 +- doc/man/pam_start.3 | 8 +- doc/man/pam_strerror.3 | 4 +- doc/man/pam_verror.3 | 6 +- doc/man/pam_vinfo.3 | 6 +- doc/man/pam_vprompt.3 | 6 +- include/Makefile.am | 2 +- include/Makefile.in | 2 +- include/security/Makefile.am | 2 +- include/security/Makefile.in | 2 +- include/security/openpam.h | 2 +- include/security/openpam_attr.h | 2 +- include/security/openpam_version.h | 8 +- include/security/pam_appl.h | 7 +- include/security/pam_constants.h | 8 +- include/security/pam_modules.h | 2 +- include/security/pam_types.h | 2 +- lib/Makefile.am | 2 +- lib/Makefile.in | 2 +- lib/libpam/Makefile.am | 2 +- lib/libpam/Makefile.in | 2 +- lib/libpam/openpam_asprintf.c | 2 +- lib/libpam/openpam_asprintf.h | 2 +- lib/libpam/openpam_borrow_cred.c | 2 +- lib/libpam/openpam_check_owner_perms.c | 2 +- lib/libpam/openpam_configure.c | 2 +- lib/libpam/openpam_constants.c | 174 +++++++++++------- lib/libpam/openpam_constants.h | 5 +- lib/libpam/openpam_cred.h | 2 +- lib/libpam/openpam_ctype.h | 2 +- lib/libpam/openpam_debug.h | 2 +- lib/libpam/openpam_dispatch.c | 6 +- lib/libpam/openpam_dlfunc.h | 2 +- lib/libpam/openpam_dynamic.c | 2 +- lib/libpam/openpam_features.c | 2 +- lib/libpam/openpam_features.h | 2 +- lib/libpam/openpam_findenv.c | 4 +- lib/libpam/openpam_free_data.c | 2 +- lib/libpam/openpam_free_envlist.c | 2 +- lib/libpam/openpam_get_feature.c | 8 +- lib/libpam/openpam_get_option.c | 2 +- lib/libpam/openpam_impl.h | 4 +- lib/libpam/openpam_load.c | 2 +- lib/libpam/openpam_log.c | 2 +- lib/libpam/openpam_nullconv.c | 2 +- lib/libpam/openpam_readline.c | 2 +- lib/libpam/openpam_readlinev.c | 2 +- lib/libpam/openpam_readword.c | 4 +- lib/libpam/openpam_restore_cred.c | 2 +- lib/libpam/openpam_set_feature.c | 8 +- lib/libpam/openpam_set_option.c | 2 +- lib/libpam/openpam_static.c | 2 +- lib/libpam/openpam_straddch.c | 2 +- lib/libpam/openpam_strlcat.c | 2 +- lib/libpam/openpam_strlcat.h | 2 +- lib/libpam/openpam_strlcmp.h | 2 +- lib/libpam/openpam_strlcpy.c | 2 +- lib/libpam/openpam_strlcpy.h | 2 +- lib/libpam/openpam_strlset.c | 2 +- lib/libpam/openpam_strlset.h | 2 +- lib/libpam/openpam_subst.c | 2 +- lib/libpam/openpam_ttyconv.c | 2 +- lib/libpam/openpam_vasprintf.c | 2 +- lib/libpam/openpam_vasprintf.h | 2 +- lib/libpam/pam_acct_mgmt.c | 2 +- lib/libpam/pam_authenticate.c | 10 +- lib/libpam/pam_authenticate_secondary.c | 2 +- lib/libpam/pam_chauthtok.c | 10 +- lib/libpam/pam_close_session.c | 10 +- lib/libpam/pam_end.c | 12 +- lib/libpam/pam_error.c | 2 +- lib/libpam/pam_get_authtok.c | 5 +- lib/libpam/pam_get_data.c | 4 +- lib/libpam/pam_get_item.c | 8 +- lib/libpam/pam_get_mapped_authtok.c | 2 +- lib/libpam/pam_get_mapped_username.c | 2 +- lib/libpam/pam_get_user.c | 2 +- lib/libpam/pam_getenv.c | 4 +- lib/libpam/pam_getenvlist.c | 8 +- lib/libpam/pam_info.c | 2 +- lib/libpam/pam_open_session.c | 10 +- lib/libpam/pam_prompt.c | 2 +- lib/libpam/pam_putenv.c | 4 +- lib/libpam/pam_set_data.c | 4 +- lib/libpam/pam_set_item.c | 11 +- lib/libpam/pam_set_mapped_authtok.c | 2 +- lib/libpam/pam_set_mapped_username.c | 2 +- lib/libpam/pam_setcred.c | 10 +- lib/libpam/pam_setenv.c | 4 +- lib/libpam/pam_sm_acct_mgmt.c | 2 +- lib/libpam/pam_sm_authenticate.c | 2 +- lib/libpam/pam_sm_authenticate_secondary.c | 2 +- lib/libpam/pam_sm_chauthtok.c | 2 +- lib/libpam/pam_sm_close_session.c | 2 +- lib/libpam/pam_sm_get_mapped_authtok.c | 2 +- lib/libpam/pam_sm_get_mapped_username.c | 2 +- lib/libpam/pam_sm_open_session.c | 2 +- lib/libpam/pam_sm_set_mapped_authtok.c | 2 +- lib/libpam/pam_sm_set_mapped_username.c | 2 +- lib/libpam/pam_sm_setcred.c | 2 +- lib/libpam/pam_start.c | 2 +- lib/libpam/pam_strerror.c | 70 +------ lib/libpam/pam_verror.c | 2 +- lib/libpam/pam_vinfo.c | 2 +- lib/libpam/pam_vprompt.c | 2 +- misc/gendoc.pl | 42 +++-- mkpkgng.in | 2 +- modules/Makefile.am | 2 +- modules/Makefile.in | 2 +- modules/pam_deny/Makefile.am | 2 +- modules/pam_deny/Makefile.in | 2 +- modules/pam_deny/pam_deny.c | 2 +- modules/pam_permit/Makefile.am | 2 +- modules/pam_permit/Makefile.in | 2 +- modules/pam_permit/pam_permit.c | 2 +- modules/pam_return/Makefile.am | 2 +- modules/pam_return/Makefile.in | 2 +- modules/pam_return/pam_return.c | 2 +- modules/pam_unix/Makefile.am | 2 +- modules/pam_unix/Makefile.in | 2 +- modules/pam_unix/pam_unix.c | 2 +- t/Makefile.am | 2 +- t/Makefile.in | 2 +- t/t_openpam_ctype.c | 6 +- t/t_openpam_dispatch.c | 28 +-- t/t_openpam_readlinev.c | 20 +- t/t_openpam_readword.c | 23 +-- t/t_pam_conv.c | 12 +- t/t_pam_conv.h | 2 +- 200 files changed, 651 insertions(+), 538 deletions(-) diff --git a/HISTORY b/HISTORY index 12efa5564bd4..bfcc4726652f 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,23 @@ +OpenPAM Resedacea 2017-04-30 + + - BUGFIX: Reinstore the NULL check in pam_end(3) which was removed in + OpenPAM Radula, as it breaks common error-handling constructs. + + - BUGFIX: Return PAM_SYMBOL_ERR instead of PAM_SYSTEM_ERR from the + dispatcher when the required service function could not be found. + + - ENHANCE: Introduce the PAM_BAD_HANDLE error code for when pamh is + NULL in API functions that have a NULL check. + + - ENHANCE: Introduce the PAM_BAD_ITEM, PAM_BAD_FEATURE and + PAM_BAD_CONSTANT error codes for situations where we previously + incorrectly used PAM_SYMBOL_ERR to denote that an invalid constant + had been passed to an API function. + + - ENHANCE: Improve the RETURN VALUES section in API man pages, + especially for functions that cannot fail, which were incorrectly + documented as returning -1 on failure. +============================================================================ OpenPAM Radula 2017-02-19 - BUGFIX: Fix an inverted test which prevented pam_get_authtok(3) and diff --git a/Makefile.am b/Makefile.am index a716d6cf024c..6355cefcd5bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 917 2017-02-18 14:45:27Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index b70b7895112e..80b8f14d1131 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 917 2017-02-18 14:45:27Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -165,7 +165,7 @@ CSCOPE = cscope DIST_SUBDIRS = misc include lib bin modules doc t am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/mkpkgng.in INSTALL README TODO compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing + config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/RELNOTES b/RELNOTES index 87511047f0de..23b159a29366 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,6 +1,6 @@ - Release notes for OpenPAM Radula - ================================ + Release notes for OpenPAM Resedacea + =================================== OpenPAM is developed primarily on FreeBSD, but is expected to work on almost any POSIX-like platform that has GNU autotools, GNU make and diff --git a/autogen.sh b/autogen.sh index 469ee1159b37..4573429d4ee9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: autogen.sh 814 2014-09-12 07:46:46Z des $ +# $OpenPAM: autogen.sh 938 2017-04-30 21:34:42Z des $ # libtoolize --copy --force diff --git a/bin/Makefile.am b/bin/Makefile.am index 4e24efb26fdc..ce57b7a74ab7 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ SUBDIRS = openpam_dump_policy diff --git a/bin/Makefile.in b/bin/Makefile.in index d381ec35cb16..24ccda7b7865 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ diff --git a/bin/openpam_dump_policy/Makefile.am b/bin/openpam_dump_policy/Makefile.am index 23f61df0c771..3769cd124610 100644 --- a/bin/openpam_dump_policy/Makefile.am +++ b/bin/openpam_dump_policy/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam diff --git a/bin/openpam_dump_policy/Makefile.in b/bin/openpam_dump_policy/Makefile.in index 24296379d57f..bf89f6e5e878 100644 --- a/bin/openpam_dump_policy/Makefile.in +++ b/bin/openpam_dump_policy/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/bin/openpam_dump_policy/openpam_dump_policy.c b/bin/openpam_dump_policy/openpam_dump_policy.c index 8047005d1862..fc78100fb581 100644 --- a/bin/openpam_dump_policy/openpam_dump_policy.c +++ b/bin/openpam_dump_policy/openpam_dump_policy.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dump_policy.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_dump_policy.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/bin/pamtest/Makefile.am b/bin/pamtest/Makefile.am index 7d2c7357544f..b490fab8f6ae 100644 --- a/bin/pamtest/Makefile.am +++ b/bin/pamtest/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ AM_CPPFLAGS = -I$(top_srcdir)/include diff --git a/bin/pamtest/Makefile.in b/bin/pamtest/Makefile.in index f5080e6dd518..6659af8a3ef5 100644 --- a/bin/pamtest/Makefile.in +++ b/bin/pamtest/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/bin/pamtest/pamtest.1 b/bin/pamtest/pamtest.1 index 3eee8bfd1dd1..0b142abe0777 100644 --- a/bin/pamtest/pamtest.1 +++ b/bin/pamtest/pamtest.1 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2011 Dag-Erling Smørgrav +.\" Copyright (c) 2011-2017 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: pamtest.1 924 2017-02-19 20:52:28Z des $ +.\" $OpenPAM: pamtest.1 939 2017-04-30 21:36:50Z des $ .\" -.Dd February 19, 2017 +.Dd April 30, 2017 .Dt PAMTEST 1 .Os .Sh NAME diff --git a/bin/pamtest/pamtest.c b/bin/pamtest/pamtest.c index e67bf7766f90..3eb0768774d0 100644 --- a/bin/pamtest/pamtest.c +++ b/bin/pamtest/pamtest.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pamtest.c 685 2013-07-11 16:33:34Z des $ + * $OpenPAM: pamtest.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/bin/su/Makefile.am b/bin/su/Makefile.am index 0f95c001f8ad..c9f3b23bb33b 100644 --- a/bin/su/Makefile.am +++ b/bin/su/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ AM_CPPFLAGS = -I$(top_srcdir)/include diff --git a/bin/su/Makefile.in b/bin/su/Makefile.in index 6cb42e98874d..82e6f99bc83e 100644 --- a/bin/su/Makefile.in +++ b/bin/su/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/bin/su/su.1 b/bin/su/su.1 index 996fcba2766e..e6fceb061d46 100644 --- a/bin/su/su.1 +++ b/bin/su/su.1 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2011 Dag-Erling Smørgrav +.\" Copyright (c) 2011-2017 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: su.1 924 2017-02-19 20:52:28Z des $ +.\" $OpenPAM: su.1 939 2017-04-30 21:36:50Z des $ .\" -.Dd February 19, 2017 +.Dd April 30, 2017 .Dt SU 1 .Os .Sh NAME diff --git a/bin/su/su.c b/bin/su/su.c index 18a3cee75d37..cb83628f3c65 100644 --- a/bin/su/su.c +++ b/bin/su/su.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: su.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: su.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/configure b/configure index 703ae7649da2..49db637d1ed7 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Id: configure.ac 924 2017-02-19 20:52:28Z des . +# From configure.ac OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenPAM 20170219. +# Generated by GNU Autoconf 2.69 for OpenPAM 20170430. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenPAM' PACKAGE_TARNAME='openpam' -PACKAGE_VERSION='20170219' -PACKAGE_STRING='OpenPAM 20170219' +PACKAGE_VERSION='20170430' +PACKAGE_STRING='OpenPAM 20170430' PACKAGE_BUGREPORT='des@des.no' PACKAGE_URL='http://www.openpam.org/' @@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenPAM 20170219 to adapt to many kinds of systems. +\`configure' configures OpenPAM 20170430 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1415,7 +1415,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenPAM 20170219:";; + short | recursive ) echo "Configuration of OpenPAM 20170430:";; esac cat <<\_ACEOF @@ -1540,7 +1540,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenPAM configure 20170219 +OpenPAM configure 20170430 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1909,7 +1909,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenPAM $as_me 20170219, which was +It was created by OpenPAM $as_me 20170430, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2774,7 +2774,7 @@ fi # Define the identity of the package. PACKAGE='openpam' - VERSION='20170219' + VERSION='20170430' cat >>confdefs.h <<_ACEOF @@ -13577,7 +13577,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenPAM $as_me 20170219, which was +This file was extended by OpenPAM $as_me 20170430, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13644,7 +13644,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenPAM config.status 20170219 +OpenPAM config.status 20170430 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 88feebc5394f..57a8b9d02aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -dnl $Id: configure.ac 924 2017-02-19 20:52:28Z des $ +dnl $OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $ AC_PREREQ([2.62]) -AC_REVISION([$Id: configure.ac 924 2017-02-19 20:52:28Z des $]) -AC_INIT([OpenPAM], [20170219], [des@des.no], [openpam], [http://www.openpam.org/]) +AC_REVISION([$OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $]) +AC_INIT([OpenPAM], [20170430], [des@des.no], [openpam], [http://www.openpam.org/]) AC_CONFIG_SRCDIR([lib/libpam/pam_start.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) diff --git a/doc/Makefile.am b/doc/Makefile.am index cb9f04a1f6fe..62b1f3518d44 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,3 @@ -# $Id: Makefile.am 648 2013-03-05 17:54:27Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ SUBDIRS = man diff --git a/doc/Makefile.in b/doc/Makefile.in index 21da50599f8e..5a310ff1d982 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 648 2013-03-05 17:54:27Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index b1a8133f0c35..a5431bcd1979 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ NULL = diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in index 797058bad7aa..14c1db300436 100644 --- a/doc/man/Makefile.in +++ b/doc/man/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ false; \ diff --git a/doc/man/openpam.3 b/doc/man/openpam.3 index 78ec8db0aafe..4c39ffe3483f 100644 --- a/doc/man/openpam.3 +++ b/doc/man/openpam.3 @@ -1,5 +1,5 @@ .\" Generated by gendoc.pl -.Dd February 19, 2017 +.Dd April 30, 2017 .Dt OPENPAM 3 .Os .Sh NAME @@ -81,7 +81,7 @@ .Ft "int" .Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap" .\" -.\" $Id: openpam.man 648 2013-03-05 17:54:27Z des $ +.\" $OpenPAM: openpam.man 938 2017-04-30 21:34:42Z des $ .\" .Sh DESCRIPTION These functions are OpenPAM extensions to the PAM API. diff --git a/doc/man/openpam.man b/doc/man/openpam.man index a7dd7f0a9ff8..251d41a97422 100644 --- a/doc/man/openpam.man +++ b/doc/man/openpam.man @@ -1,5 +1,5 @@ .\" -.\" $Id: openpam.man 648 2013-03-05 17:54:27Z des $ +.\" $OpenPAM: openpam.man 938 2017-04-30 21:34:42Z des $ .\" .Sh DESCRIPTION These functions are OpenPAM extensions to the PAM API. diff --git a/doc/man/openpam_borrow_cred.3 b/doc/man/openpam_borrow_cred.3 index bf25a475fbd6..687ad425ed6f 100644 --- a/doc/man/openpam_borrow_cred.3 +++ b/doc/man/openpam_borrow_cred.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_borrow_cred.c by gendoc.pl -.\" $Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME @@ -29,6 +29,8 @@ The .Fn openpam_borrow_cred function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_PERM_DENIED diff --git a/doc/man/openpam_free_data.3 b/doc/man/openpam_free_data.3 index ca2fe51dfd92..a804c2a51579 100644 --- a/doc/man/openpam_free_data.3 +++ b/doc/man/openpam_free_data.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_free_data.c by gendoc.pl -.\" $Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME diff --git a/doc/man/openpam_free_envlist.3 b/doc/man/openpam_free_envlist.3 index f8ed6f08e2c3..d069ba00407f 100644 --- a/doc/man/openpam_free_envlist.3 +++ b/doc/man/openpam_free_envlist.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_free_envlist.c by gendoc.pl -.\" $Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_FREE_ENVLIST 3 .Os .Sh NAME diff --git a/doc/man/openpam_get_feature.3 b/doc/man/openpam_get_feature.3 index 45b6bcc91d69..daf49a4b63d1 100644 --- a/doc/man/openpam_get_feature.3 +++ b/doc/man/openpam_get_feature.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_get_feature.c by gendoc.pl -.\" $Id: openpam_get_feature.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_get_feature.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_GET_FEATURE 3 .Os .Sh NAME @@ -50,8 +50,10 @@ The .Fn openpam_get_feature function returns one of the following values: .Bl -tag -width 18n -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_FEATURE +Unrecognized or restricted feature. .El .Sh SEE ALSO .Xr openpam_set_feature 3 , diff --git a/doc/man/openpam_get_option.3 b/doc/man/openpam_get_option.3 index fcfd9b83dd00..bdf73db9709c 100644 --- a/doc/man/openpam_get_option.3 +++ b/doc/man/openpam_get_option.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_get_option.c by gendoc.pl -.\" $Id: openpam_get_option.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_get_option.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME diff --git a/doc/man/openpam_log.3 b/doc/man/openpam_log.3 index 0930abb17ccb..a761547fc434 100644 --- a/doc/man/openpam_log.3 +++ b/doc/man/openpam_log.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_log.c by gendoc.pl -.\" $Id: openpam_log.c 686 2013-07-11 16:36:02Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_log.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_LOG 3 .Os .Sh NAME diff --git a/doc/man/openpam_nullconv.3 b/doc/man/openpam_nullconv.3 index 0ce1e44edead..7a8139ebe0ec 100644 --- a/doc/man/openpam_nullconv.3 +++ b/doc/man/openpam_nullconv.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_nullconv.c by gendoc.pl -.\" $Id: openpam_nullconv.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_nullconv.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME @@ -38,6 +38,8 @@ The .Fn openpam_nullconv function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_CONV_ERR Conversation failure. .El diff --git a/doc/man/openpam_readline.3 b/doc/man/openpam_readline.3 index db888ad97cfb..e33167d82e66 100644 --- a/doc/man/openpam_readline.3 +++ b/doc/man/openpam_readline.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_readline.c by gendoc.pl -.\" $Id: openpam_readline.c 703 2013-08-16 11:57:54Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_readline.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_READLINE 3 .Os .Sh NAME diff --git a/doc/man/openpam_readlinev.3 b/doc/man/openpam_readlinev.3 index 9fb28e18cdee..6391ff50b417 100644 --- a/doc/man/openpam_readlinev.3 +++ b/doc/man/openpam_readlinev.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_readlinev.c by gendoc.pl -.\" $Id: openpam_readlinev.c 890 2016-01-11 16:22:09Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_readlinev.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_READLINEV 3 .Os .Sh NAME diff --git a/doc/man/openpam_readword.3 b/doc/man/openpam_readword.3 index 8bb0f492d799..e7c8b0f9224b 100644 --- a/doc/man/openpam_readword.3 +++ b/doc/man/openpam_readword.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_readword.c by gendoc.pl -.\" $Id: openpam_readword.c 916 2017-02-07 12:25:58Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_readword.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_READWORD 3 .Os .Sh NAME diff --git a/doc/man/openpam_restore_cred.3 b/doc/man/openpam_restore_cred.3 index 3b1c27e361a5..3319fd56b14b 100644 --- a/doc/man/openpam_restore_cred.3 +++ b/doc/man/openpam_restore_cred.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_restore_cred.c by gendoc.pl -.\" $Id: openpam_restore_cred.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_restore_cred.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME @@ -23,6 +23,8 @@ The .Fn openpam_restore_cred function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_NO_MODULE_DATA Module data not found. .It Bq Er PAM_SYSTEM_ERR diff --git a/doc/man/openpam_set_feature.3 b/doc/man/openpam_set_feature.3 index bc5865096975..30774210df06 100644 --- a/doc/man/openpam_set_feature.3 +++ b/doc/man/openpam_set_feature.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_set_feature.c by gendoc.pl -.\" $Id: openpam_set_feature.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_set_feature.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_SET_FEATURE 3 .Os .Sh NAME @@ -32,8 +32,10 @@ The .Fn openpam_set_feature function returns one of the following values: .Bl -tag -width 18n -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_FEATURE +Unrecognized or restricted feature. .El .Sh SEE ALSO .Xr openpam_get_feature 3 , diff --git a/doc/man/openpam_set_option.3 b/doc/man/openpam_set_option.3 index 8cb0a7c65f83..751c3177425e 100644 --- a/doc/man/openpam_set_option.3 +++ b/doc/man/openpam_set_option.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_set_option.c by gendoc.pl -.\" $Id: openpam_set_option.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_set_option.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME @@ -23,6 +23,8 @@ The .Fn openpam_set_option function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_SYSTEM_ERR diff --git a/doc/man/openpam_straddch.3 b/doc/man/openpam_straddch.3 index 127858f637a6..5f67891c814e 100644 --- a/doc/man/openpam_straddch.3 +++ b/doc/man/openpam_straddch.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_straddch.c by gendoc.pl -.\" $Id: openpam_straddch.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_straddch.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_STRADDCH 3 .Os .Sh NAME diff --git a/doc/man/openpam_subst.3 b/doc/man/openpam_subst.3 index 5c0c111e32ff..ce55577854d5 100644 --- a/doc/man/openpam_subst.3 +++ b/doc/man/openpam_subst.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_subst.c by gendoc.pl -.\" $Id: openpam_subst.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_subst.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_SUBST 3 .Os .Sh NAME @@ -81,6 +81,10 @@ The .Fn openpam_subst function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .It Bq Er PAM_TRY_AGAIN Try again. .El diff --git a/doc/man/openpam_ttyconv.3 b/doc/man/openpam_ttyconv.3 index 6aeb9f3b3eeb..4be2cd698dff 100644 --- a/doc/man/openpam_ttyconv.3 +++ b/doc/man/openpam_ttyconv.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_ttyconv.c by gendoc.pl -.\" $Id: openpam_ttyconv.c 890 2016-01-11 16:22:09Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: openpam_ttyconv.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME @@ -32,6 +32,8 @@ The .Fn openpam_ttyconv function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam.3 b/doc/man/pam.3 index 5b46b6d3a8d0..7707e5dbf7af 100644 --- a/doc/man/pam.3 +++ b/doc/man/pam.3 @@ -1,5 +1,5 @@ .\" Generated by gendoc.pl -.Dd February 19, 2017 +.Dd April 30, 2017 .Dt PAM 3 .Os .Sh NAME @@ -60,7 +60,7 @@ .Ft "const char *" .Fn pam_strerror "const pam_handle_t *pamh" "int error_number" .\" -.\" $Id: pam.man 648 2013-03-05 17:54:27Z des $ +.\" $OpenPAM: pam.man 938 2017-04-30 21:34:42Z des $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number @@ -180,6 +180,14 @@ Authentication token lock busy. Failed to recover old authentication token. .It Bq Er PAM_AUTH_ERR Authentication error. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. +.It Bq Er PAM_BAD_FEATURE +Unrecognized or restricted feature. +.It Bq Er PAM_BAD_HANDLE +Invalid PAM handle. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam.conf.5 b/doc/man/pam.conf.5 index 64adb9d238a2..777e839ea2ca 100644 --- a/doc/man/pam.conf.5 +++ b/doc/man/pam.conf.5 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005-2011 Dag-Erling Smørgrav +.\" Copyright (c) 2005-2017 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: pam.conf.5 924 2017-02-19 20:52:28Z des $ +.\" $OpenPAM: pam.conf.5 939 2017-04-30 21:36:50Z des $ .\" -.Dd February 19, 2017 +.Dd April 30, 2017 .Dt PAM.CONF 5 .Os .Sh NAME diff --git a/doc/man/pam.man b/doc/man/pam.man index 24c5d3242499..16873f57de64 100644 --- a/doc/man/pam.man +++ b/doc/man/pam.man @@ -1,5 +1,5 @@ .\" -.\" $Id: pam.man 648 2013-03-05 17:54:27Z des $ +.\" $OpenPAM: pam.man 938 2017-04-30 21:34:42Z des $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number diff --git a/doc/man/pam_acct_mgmt.3 b/doc/man/pam_acct_mgmt.3 index b6d2d4f0fa5a..bd32933f3721 100644 --- a/doc/man/pam_acct_mgmt.3 +++ b/doc/man/pam_acct_mgmt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_acct_mgmt.c by gendoc.pl -.\" $Id: pam_acct_mgmt.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME @@ -37,6 +37,8 @@ The .Fn pam_acct_mgmt function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_ACCT_EXPIRED diff --git a/doc/man/pam_authenticate.3 b/doc/man/pam_authenticate.3 index 46a9994c6800..2701172abe58 100644 --- a/doc/man/pam_authenticate.3 +++ b/doc/man/pam_authenticate.3 @@ -1,6 +1,6 @@ .\" Generated from pam_authenticate.c by gendoc.pl -.\" $Id: pam_authenticate.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_authenticate.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -41,18 +41,22 @@ Fail if the user's authentication token is null. If any other bits are set, .Fn pam_authenticate will return -.Dv PAM_SYMBOL_ERR . +.Dv PAM_BAD_CONSTANT . .Sh RETURN VALUES The .Fn pam_authenticate function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_AUTHINFO_UNAVAIL Authentication information is unavailable. .It Bq Er PAM_AUTH_ERR Authentication error. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR @@ -65,8 +69,6 @@ Maximum number of tries exceeded. Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_USER_UNKNOWN diff --git a/doc/man/pam_chauthtok.3 b/doc/man/pam_chauthtok.3 index 63a53e618e8f..89b7416db8dc 100644 --- a/doc/man/pam_chauthtok.3 +++ b/doc/man/pam_chauthtok.3 @@ -1,6 +1,6 @@ .\" Generated from pam_chauthtok.c by gendoc.pl -.\" $Id: pam_chauthtok.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_chauthtok.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -33,12 +33,14 @@ Change only those authentication tokens that have expired. If any other bits are set, .Fn pam_chauthtok will return -.Dv PAM_SYMBOL_ERR . +.Dv PAM_BAD_CONSTANT . .Sh RETURN VALUES The .Fn pam_chauthtok function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_AUTHTOK_DISABLE_AGING @@ -49,6 +51,8 @@ Authentication token failure. Authentication token lock busy. .It Bq Er PAM_AUTHTOK_RECOVERY_ERR Failed to recover old authentication token. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR @@ -57,8 +61,6 @@ Conversation failure. Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_TRY_AGAIN diff --git a/doc/man/pam_close_session.3 b/doc/man/pam_close_session.3 index 3d9ed399fad1..749d2199f21c 100644 --- a/doc/man/pam_close_session.3 +++ b/doc/man/pam_close_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_close_session.c by gendoc.pl -.\" $Id: pam_close_session.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_close_session.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME @@ -30,14 +30,18 @@ Do not emit any messages. If any other bits are set, .Fn pam_close_session will return -.Dv PAM_SYMBOL_ERR . +.Dv PAM_BAD_CONSTANT . .Sh RETURN VALUES The .Fn pam_close_session function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR @@ -48,8 +52,6 @@ Permission denied. Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El diff --git a/doc/man/pam_conv.3 b/doc/man/pam_conv.3 index dcf34a25bffd..bbf0a572cbe7 100644 --- a/doc/man/pam_conv.3 +++ b/doc/man/pam_conv.3 @@ -1,6 +1,6 @@ .\"- .\" Copyright (c) 2002-2003 Networks Associates Technology, Inc. -.\" Copyright (c) 2004-2014 Dag-Erling Smørgrav +.\" Copyright (c) 2004-2017 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,9 +32,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: pam_conv.3 924 2017-02-19 20:52:28Z des $ +.\" $OpenPAM: pam_conv.3 939 2017-04-30 21:36:50Z des $ .\" -.Dd February 19, 2017 +.Dd April 30, 2017 .Dt PAM_CONV 3 .Os .Sh NAME diff --git a/doc/man/pam_end.3 b/doc/man/pam_end.3 index 80ff655d3ad8..af4cbecffe62 100644 --- a/doc/man/pam_end.3 +++ b/doc/man/pam_end.3 @@ -1,6 +1,6 @@ .\" Generated from pam_end.c by gendoc.pl -.\" $Id: pam_end.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_end.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_END 3 .Os .Sh NAME @@ -25,7 +25,13 @@ last API call before the call to .Sh RETURN VALUES The .Fn pam_end -function returns 0 on success and -1 on failure. +function returns one of the following values: +.Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_HANDLE +Invalid PAM handle. +.El .Sh SEE ALSO .Xr pam 3 , .Xr pam_strerror 3 diff --git a/doc/man/pam_error.3 b/doc/man/pam_error.3 index de63c1ec02c8..cf3445ea906a 100644 --- a/doc/man/pam_error.3 +++ b/doc/man/pam_error.3 @@ -1,6 +1,6 @@ .\" Generated from pam_error.c by gendoc.pl -.\" $Id: pam_error.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_error.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_ERROR 3 .Os .Sh NAME @@ -22,6 +22,8 @@ The .Fn pam_error function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_get_authtok.3 b/doc/man/pam_get_authtok.3 index dab3de823305..bedeffbe033c 100644 --- a/doc/man/pam_get_authtok.3 +++ b/doc/man/pam_get_authtok.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_authtok.c by gendoc.pl -.\" $Id: pam_get_authtok.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_get_authtok.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME @@ -121,6 +121,12 @@ The .Fn pam_get_authtok function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_get_data.3 b/doc/man/pam_get_data.3 index 35b3cd17cc13..104e25aeca96 100644 --- a/doc/man/pam_get_data.3 +++ b/doc/man/pam_get_data.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_data.c by gendoc.pl -.\" $Id: pam_get_data.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_get_data.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_GET_DATA 3 .Os .Sh NAME @@ -39,6 +39,8 @@ The .Fn pam_get_data function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_NO_MODULE_DATA Module data not found. .El diff --git a/doc/man/pam_get_item.3 b/doc/man/pam_get_item.3 index c53e9228346b..9f96e96b6407 100644 --- a/doc/man/pam_get_item.3 +++ b/doc/man/pam_get_item.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_item.c by gendoc.pl -.\" $Id: pam_get_item.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_get_item.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_GET_ITEM 3 .Os .Sh NAME @@ -74,8 +74,10 @@ The .Fn pam_get_item function returns one of the following values: .Bl -tag -width 18n -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .El .Sh SEE ALSO .Xr pam 3 , diff --git a/doc/man/pam_get_user.3 b/doc/man/pam_get_user.3 index 96c1af61dfd7..58a861d48075 100644 --- a/doc/man/pam_get_user.3 +++ b/doc/man/pam_get_user.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_user.c by gendoc.pl -.\" $Id: pam_get_user.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_get_user.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_GET_USER 3 .Os .Sh NAME @@ -66,6 +66,10 @@ The .Fn pam_get_user function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_getenv.3 b/doc/man/pam_getenv.3 index d2dd7829bb26..dbbb484896f4 100644 --- a/doc/man/pam_getenv.3 +++ b/doc/man/pam_getenv.3 @@ -1,6 +1,6 @@ .\" Generated from pam_getenv.c by gendoc.pl -.\" $Id: pam_getenv.c 914 2017-01-21 15:15:29Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_GETENV 3 .Os .Sh NAME diff --git a/doc/man/pam_getenvlist.3 b/doc/man/pam_getenvlist.3 index 9fa65e746983..29827cd53a32 100644 --- a/doc/man/pam_getenvlist.3 +++ b/doc/man/pam_getenvlist.3 @@ -1,6 +1,6 @@ .\" Generated from pam_getenvlist.c by gendoc.pl -.\" $Id: pam_getenvlist.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_getenvlist.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_GETENVLIST 3 .Os .Sh NAME diff --git a/doc/man/pam_info.3 b/doc/man/pam_info.3 index 5fe84b25d74a..5fd8d5f57195 100644 --- a/doc/man/pam_info.3 +++ b/doc/man/pam_info.3 @@ -1,6 +1,6 @@ .\" Generated from pam_info.c by gendoc.pl -.\" $Id: pam_info.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_info.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_INFO 3 .Os .Sh NAME @@ -22,6 +22,8 @@ The .Fn pam_info function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_open_session.3 b/doc/man/pam_open_session.3 index 052a17fe0f0a..dd026071edac 100644 --- a/doc/man/pam_open_session.3 +++ b/doc/man/pam_open_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_open_session.c by gendoc.pl -.\" $Id: pam_open_session.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_open_session.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME @@ -31,14 +31,18 @@ Do not emit any messages. If any other bits are set, .Fn pam_open_session will return -.Dv PAM_SYMBOL_ERR . +.Dv PAM_BAD_CONSTANT . .Sh RETURN VALUES The .Fn pam_open_session function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR @@ -49,8 +53,6 @@ Permission denied. Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El diff --git a/doc/man/pam_prompt.3 b/doc/man/pam_prompt.3 index d98696687f9c..b78ce3a41b41 100644 --- a/doc/man/pam_prompt.3 +++ b/doc/man/pam_prompt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_prompt.c by gendoc.pl -.\" $Id: pam_prompt.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_prompt.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_PROMPT 3 .Os .Sh NAME @@ -34,6 +34,8 @@ The .Fn pam_prompt function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_putenv.3 b/doc/man/pam_putenv.3 index e177c584e28f..2be772ffec3f 100644 --- a/doc/man/pam_putenv.3 +++ b/doc/man/pam_putenv.3 @@ -1,6 +1,6 @@ .\" Generated from pam_putenv.c by gendoc.pl -.\" $Id: pam_putenv.c 914 2017-01-21 15:15:29Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_putenv.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_PUTENV 3 .Os .Sh NAME @@ -25,6 +25,8 @@ The .Fn pam_putenv function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_SYSTEM_ERR diff --git a/doc/man/pam_set_data.3 b/doc/man/pam_set_data.3 index 8232740f3a7d..253d014877fc 100644 --- a/doc/man/pam_set_data.3 +++ b/doc/man/pam_set_data.3 @@ -1,6 +1,6 @@ .\" Generated from pam_set_data.c by gendoc.pl -.\" $Id: pam_set_data.c 913 2017-01-21 15:11:12Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_set_data.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SET_DATA 3 .Os .Sh NAME @@ -38,6 +38,8 @@ The .Fn pam_set_data function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_SYSTEM_ERR diff --git a/doc/man/pam_set_item.3 b/doc/man/pam_set_item.3 index 2165f5721538..3d479c92dd1d 100644 --- a/doc/man/pam_set_item.3 +++ b/doc/man/pam_set_item.3 @@ -1,6 +1,6 @@ .\" Generated from pam_set_item.c by gendoc.pl -.\" $Id: pam_set_item.c 918 2017-02-19 17:46:22Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_set_item.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SET_ITEM 3 .Os .Sh NAME @@ -30,12 +30,12 @@ The .Fn pam_set_item function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .It Bq Er PAM_BUF_ERR Memory buffer error. -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. -.It Bq Er PAM_SYSTEM_ERR -System error. .El .Sh SEE ALSO .Xr pam 3 , diff --git a/doc/man/pam_setcred.3 b/doc/man/pam_setcred.3 index 830043b024e8..fc5eaadc2b0c 100644 --- a/doc/man/pam_setcred.3 +++ b/doc/man/pam_setcred.3 @@ -1,6 +1,6 @@ .\" Generated from pam_setcred.c by gendoc.pl -.\" $Id: pam_setcred.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_setcred.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SETCRED 3 .Os .Sh NAME @@ -38,14 +38,18 @@ The latter four are mutually exclusive. If any other bits are set, .Fn pam_setcred will return -.Dv PAM_SYMBOL_ERR . +.Dv PAM_BAD_CONSTANT . .Sh RETURN VALUES The .Fn pam_setcred function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. +.It Bq Er PAM_BAD_CONSTANT +Bad constant. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR @@ -60,8 +64,6 @@ Failed to retrieve user credentials. Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. -.It Bq Er PAM_SYMBOL_ERR -Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_USER_UNKNOWN diff --git a/doc/man/pam_setenv.3 b/doc/man/pam_setenv.3 index 09e9ec5532ac..8fced1e8cc5e 100644 --- a/doc/man/pam_setenv.3 +++ b/doc/man/pam_setenv.3 @@ -1,6 +1,6 @@ .\" Generated from pam_setenv.c by gendoc.pl -.\" $Id: pam_setenv.c 914 2017-01-21 15:15:29Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_setenv.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SETENV 3 .Os .Sh NAME @@ -25,6 +25,8 @@ The .Fn pam_setenv function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_SYSTEM_ERR diff --git a/doc/man/pam_sm_acct_mgmt.3 b/doc/man/pam_sm_acct_mgmt.3 index e28174f75395..2df56b5aa29a 100644 --- a/doc/man/pam_sm_acct_mgmt.3 +++ b/doc/man/pam_sm_acct_mgmt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_acct_mgmt.c by gendoc.pl -.\" $Id: pam_sm_acct_mgmt.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_sm_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME @@ -24,6 +24,8 @@ The .Fn pam_sm_acct_mgmt function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_ACCT_EXPIRED diff --git a/doc/man/pam_sm_authenticate.3 b/doc/man/pam_sm_authenticate.3 index 3d7d0ce3014a..1dc6c69ca9b5 100644 --- a/doc/man/pam_sm_authenticate.3 +++ b/doc/man/pam_sm_authenticate.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_authenticate.c by gendoc.pl -.\" $Id: pam_sm_authenticate.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_sm_authenticate.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME @@ -24,6 +24,8 @@ The .Fn pam_sm_authenticate function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_AUTHINFO_UNAVAIL diff --git a/doc/man/pam_sm_chauthtok.3 b/doc/man/pam_sm_chauthtok.3 index 3905973fa7c8..be1baa8d5791 100644 --- a/doc/man/pam_sm_chauthtok.3 +++ b/doc/man/pam_sm_chauthtok.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_chauthtok.c by gendoc.pl -.\" $Id: pam_sm_chauthtok.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_sm_chauthtok.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME @@ -34,6 +34,8 @@ The .Fn pam_sm_chauthtok function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_AUTHTOK_DISABLE_AGING diff --git a/doc/man/pam_sm_close_session.3 b/doc/man/pam_sm_close_session.3 index d07ebf9aee6e..5b2034e15c7e 100644 --- a/doc/man/pam_sm_close_session.3 +++ b/doc/man/pam_sm_close_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_close_session.c by gendoc.pl -.\" $Id: pam_sm_close_session.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_sm_close_session.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME @@ -24,6 +24,8 @@ The .Fn pam_sm_close_session function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_BUF_ERR diff --git a/doc/man/pam_sm_open_session.3 b/doc/man/pam_sm_open_session.3 index d4bb88ba7d1c..6b4ab9a409b3 100644 --- a/doc/man/pam_sm_open_session.3 +++ b/doc/man/pam_sm_open_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_open_session.c by gendoc.pl -.\" $Id: pam_sm_open_session.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_sm_open_session.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME @@ -24,6 +24,8 @@ The .Fn pam_sm_open_session function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_BUF_ERR diff --git a/doc/man/pam_sm_setcred.3 b/doc/man/pam_sm_setcred.3 index 0b0140fcabc7..cf1b76eb043b 100644 --- a/doc/man/pam_sm_setcred.3 +++ b/doc/man/pam_sm_setcred.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_setcred.c by gendoc.pl -.\" $Id: pam_sm_setcred.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_sm_setcred.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME @@ -24,6 +24,8 @@ The .Fn pam_sm_setcred function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_ABORT General failure. .It Bq Er PAM_BUF_ERR diff --git a/doc/man/pam_start.3 b/doc/man/pam_start.3 index 72702cb7d827..7a2ba5bb8f2a 100644 --- a/doc/man/pam_start.3 +++ b/doc/man/pam_start.3 @@ -1,6 +1,6 @@ .\" Generated from pam_start.c by gendoc.pl -.\" $Id: pam_start.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_start.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_START 3 .Os .Sh NAME @@ -45,6 +45,10 @@ The .Fn pam_start function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. +.It Bq Er PAM_BAD_ITEM +Unrecognized or restricted item. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_SYSTEM_ERR diff --git a/doc/man/pam_strerror.3 b/doc/man/pam_strerror.3 index a6901fb8dfb9..bdfb1c2649c4 100644 --- a/doc/man/pam_strerror.3 +++ b/doc/man/pam_strerror.3 @@ -1,6 +1,6 @@ .\" Generated from pam_strerror.c by gendoc.pl -.\" $Id: pam_strerror.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_strerror.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_STRERROR 3 .Os .Sh NAME diff --git a/doc/man/pam_verror.3 b/doc/man/pam_verror.3 index a4aff7e39674..ed680b72ad6b 100644 --- a/doc/man/pam_verror.3 +++ b/doc/man/pam_verror.3 @@ -1,6 +1,6 @@ .\" Generated from pam_verror.c by gendoc.pl -.\" $Id: pam_verror.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_verror.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_VERROR 3 .Os .Sh NAME @@ -26,6 +26,8 @@ The .Fn pam_verror function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_vinfo.3 b/doc/man/pam_vinfo.3 index b9f9d3f29e9b..a5923cb8573c 100644 --- a/doc/man/pam_vinfo.3 +++ b/doc/man/pam_vinfo.3 @@ -1,6 +1,6 @@ .\" Generated from pam_vinfo.c by gendoc.pl -.\" $Id: pam_vinfo.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_vinfo.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_VINFO 3 .Os .Sh NAME @@ -26,6 +26,8 @@ The .Fn pam_vinfo function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/doc/man/pam_vprompt.3 b/doc/man/pam_vprompt.3 index bd081fc776b3..4cfa9ed77dd1 100644 --- a/doc/man/pam_vprompt.3 +++ b/doc/man/pam_vprompt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_vprompt.c by gendoc.pl -.\" $Id: pam_vprompt.c 648 2013-03-05 17:54:27Z des $ -.Dd February 19, 2017 +.\" $OpenPAM: pam_vprompt.c 938 2017-04-30 21:34:42Z des $ +.Dd April 30, 2017 .Dt PAM_VPROMPT 3 .Os .Sh NAME @@ -60,6 +60,8 @@ The .Fn pam_vprompt function returns one of the following values: .Bl -tag -width 18n +.It Bq Er PAM_SUCCESS +Success. .It Bq Er PAM_BUF_ERR Memory buffer error. .It Bq Er PAM_CONV_ERR diff --git a/include/Makefile.am b/include/Makefile.am index 8a2755a7c88e..731c4a1ae1ff 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ -# $Id: Makefile.am 648 2013-03-05 17:54:27Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ SUBDIRS = security diff --git a/include/Makefile.in b/include/Makefile.in index a2464ca91140..3777407c6157 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 648 2013-03-05 17:54:27Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ diff --git a/include/security/Makefile.am b/include/security/Makefile.am index c3d10f32a08d..6f36694e02fe 100644 --- a/include/security/Makefile.am +++ b/include/security/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ securitydir = $(includedir)/security diff --git a/include/security/Makefile.in b/include/security/Makefile.in index 93cd98873048..8c1405037989 100644 --- a/include/security/Makefile.in +++ b/include/security/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/include/security/openpam.h b/include/security/openpam.h index 77f0bb8eb719..1e7bc1ef44b2 100644 --- a/include/security/openpam.h +++ b/include/security/openpam.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam.h 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_OPENPAM_H_INCLUDED diff --git a/include/security/openpam_attr.h b/include/security/openpam_attr.h index 2d88ae5f25a3..b07768139d4c 100644 --- a/include/security/openpam_attr.h +++ b/include/security/openpam_attr.h @@ -1,5 +1,5 @@ /* - * $Id: openpam_attr.h 656 2013-03-06 22:58:45Z des $ + * $OpenPAM: openpam_attr.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_OPENPAM_ATTR_H_INCLUDED diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h index f10b6a945dea..9a2e1cb17a6e 100644 --- a/include/security/openpam_version.h +++ b/include/security/openpam_version.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2014 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,14 +32,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_version.h 923 2017-02-19 19:31:16Z des $ + * $OpenPAM: openpam_version.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED #define SECURITY_OPENPAM_VERSION_H_INCLUDED #define OPENPAM -#define OPENPAM_VERSION 20170219 -#define OPENPAM_RELEASE "Radula" +#define OPENPAM_VERSION 20170430 +#define OPENPAM_RELEASE "Resedacea" #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h index 8edf897dfe7e..5f44d79555d9 100644 --- a/include/security/pam_appl.h +++ b/include/security/pam_appl.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_appl.h 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_appl.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_PAM_APPL_H_INCLUDED @@ -72,8 +72,7 @@ pam_close_session(pam_handle_t *_pamh, int pam_end(pam_handle_t *_pamh, - int _status) - OPENPAM_NONNULL((1)); + int _status); int pam_get_data(const pam_handle_t *_pamh, diff --git a/include/security/pam_constants.h b/include/security/pam_constants.h index ddd87ade41f6..a76dfecd2406 100644 --- a/include/security/pam_constants.h +++ b/include/security/pam_constants.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_constants.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_constants.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED @@ -78,6 +78,10 @@ enum { PAM_TRY_AGAIN = 27, PAM_MODULE_UNKNOWN = 28, PAM_DOMAIN_UNKNOWN = 29, + PAM_BAD_HANDLE = 30, /* OpenPAM extension */ + PAM_BAD_ITEM = 31, /* OpenPAM extension */ + PAM_BAD_FEATURE = 32, /* OpenPAM extension */ + PAM_BAD_CONSTANT = 33, /* OpenPAM extension */ PAM_NUM_ERRORS /* OpenPAM extension */ }; diff --git a/include/security/pam_modules.h b/include/security/pam_modules.h index 7f1db465f039..a1e574515b55 100644 --- a/include/security/pam_modules.h +++ b/include/security/pam_modules.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_modules.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_modules.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_PAM_MODULES_H_INCLUDED diff --git a/include/security/pam_types.h b/include/security/pam_types.h index fc834682a70c..fc5a06d6a4df 100644 --- a/include/security/pam_types.h +++ b/include/security/pam_types.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_types.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_types.h 938 2017-04-30 21:34:42Z des $ */ #ifndef SECURITY_PAM_TYPES_H_INCLUDED diff --git a/lib/Makefile.am b/lib/Makefile.am index 002d7bbddb1e..9f9fb5fa6212 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ SUBDIRS = diff --git a/lib/Makefile.in b/lib/Makefile.in index 74bf0a7d932d..ed2ff0f44813 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ diff --git a/lib/libpam/Makefile.am b/lib/libpam/Makefile.am index faf0dd553f21..34d17d0cac68 100644 --- a/lib/libpam/Makefile.am +++ b/lib/libpam/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 833 2014-10-28 09:03:41Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ NULL = diff --git a/lib/libpam/Makefile.in b/lib/libpam/Makefile.in index 7e73926685d4..c6e4b44f55c2 100644 --- a/lib/libpam/Makefile.in +++ b/lib/libpam/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 833 2014-10-28 09:03:41Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ diff --git a/lib/libpam/openpam_asprintf.c b/lib/libpam/openpam_asprintf.c index 3169f4baa497..7b40aef28423 100644 --- a/lib/libpam/openpam_asprintf.c +++ b/lib/libpam/openpam_asprintf.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_asprintf.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_asprintf.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_asprintf.h b/lib/libpam/openpam_asprintf.h index 6d9e4e39826b..79680ad6e1bf 100644 --- a/lib/libpam/openpam_asprintf.h +++ b/lib/libpam/openpam_asprintf.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_asprintf.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_asprintf.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_ASPRINTF_H_INCLUDED diff --git a/lib/libpam/openpam_borrow_cred.c b/lib/libpam/openpam_borrow_cred.c index 1b407bdfd27b..79299ac4f1bc 100644 --- a/lib/libpam/openpam_borrow_cred.c +++ b/lib/libpam/openpam_borrow_cred.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des $ + * $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_check_owner_perms.c b/lib/libpam/openpam_check_owner_perms.c index c8a598a9d448..0f99b82d2087 100644 --- a/lib/libpam/openpam_check_owner_perms.c +++ b/lib/libpam/openpam_check_owner_perms.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_check_owner_perms.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_check_owner_perms.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_configure.c b/lib/libpam/openpam_configure.c index e06eba2859dc..12f1a5163367 100644 --- a/lib/libpam/openpam_configure.c +++ b/lib/libpam/openpam_configure.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_configure.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_configure.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_constants.c b/lib/libpam/openpam_constants.c index 1cdd8101a88a..2b539e4fc765 100644 --- a/lib/libpam/openpam_constants.c +++ b/lib/libpam/openpam_constants.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_constants.c 690 2013-08-15 13:22:51Z des $ + * $OpenPAM: openpam_constants.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -44,86 +44,126 @@ #include "openpam_impl.h" const char *pam_err_name[PAM_NUM_ERRORS] = { - "PAM_SUCCESS", - "PAM_OPEN_ERR", - "PAM_SYMBOL_ERR", - "PAM_SERVICE_ERR", - "PAM_SYSTEM_ERR", - "PAM_BUF_ERR", - "PAM_CONV_ERR", - "PAM_PERM_DENIED", - "PAM_MAXTRIES", - "PAM_AUTH_ERR", - "PAM_NEW_AUTHTOK_REQD", - "PAM_CRED_INSUFFICIENT", - "PAM_AUTHINFO_UNAVAIL", - "PAM_USER_UNKNOWN", - "PAM_CRED_UNAVAIL", - "PAM_CRED_EXPIRED", - "PAM_CRED_ERR", - "PAM_ACCT_EXPIRED", - "PAM_AUTHTOK_EXPIRED", - "PAM_SESSION_ERR", - "PAM_AUTHTOK_ERR", - "PAM_AUTHTOK_RECOVERY_ERR", - "PAM_AUTHTOK_LOCK_BUSY", - "PAM_AUTHTOK_DISABLE_AGING", - "PAM_NO_MODULE_DATA", - "PAM_IGNORE", - "PAM_ABORT", - "PAM_TRY_AGAIN", - "PAM_MODULE_UNKNOWN", - "PAM_DOMAIN_UNKNOWN" + [PAM_SUCCESS] = "PAM_SUCCESS", + [PAM_OPEN_ERR] = "PAM_OPEN_ERR", + [PAM_SYMBOL_ERR] = "PAM_SYMBOL_ERR", + [PAM_SERVICE_ERR] = "PAM_SERVICE_ERR", + [PAM_SYSTEM_ERR] = "PAM_SYSTEM_ERR", + [PAM_BUF_ERR] = "PAM_BUF_ERR", + [PAM_CONV_ERR] = "PAM_CONV_ERR", + [PAM_PERM_DENIED] = "PAM_PERM_DENIED", + [PAM_MAXTRIES] = "PAM_MAXTRIES", + [PAM_AUTH_ERR] = "PAM_AUTH_ERR", + [PAM_NEW_AUTHTOK_REQD] = "PAM_NEW_AUTHTOK_REQD", + [PAM_CRED_INSUFFICIENT] = "PAM_CRED_INSUFFICIENT", + [PAM_AUTHINFO_UNAVAIL] = "PAM_AUTHINFO_UNAVAIL", + [PAM_USER_UNKNOWN] = "PAM_USER_UNKNOWN", + [PAM_CRED_UNAVAIL] = "PAM_CRED_UNAVAIL", + [PAM_CRED_EXPIRED] = "PAM_CRED_EXPIRED", + [PAM_CRED_ERR] = "PAM_CRED_ERR", + [PAM_ACCT_EXPIRED] = "PAM_ACCT_EXPIRED", + [PAM_AUTHTOK_EXPIRED] = "PAM_AUTHTOK_EXPIRED", + [PAM_SESSION_ERR] = "PAM_SESSION_ERR", + [PAM_AUTHTOK_ERR] = "PAM_AUTHTOK_ERR", + [PAM_AUTHTOK_RECOVERY_ERR] = "PAM_AUTHTOK_RECOVERY_ERR", + [PAM_AUTHTOK_LOCK_BUSY] = "PAM_AUTHTOK_LOCK_BUSY", + [PAM_AUTHTOK_DISABLE_AGING] = "PAM_AUTHTOK_DISABLE_AGING", + [PAM_NO_MODULE_DATA] = "PAM_NO_MODULE_DATA", + [PAM_IGNORE] = "PAM_IGNORE", + [PAM_ABORT] = "PAM_ABORT", + [PAM_TRY_AGAIN] = "PAM_TRY_AGAIN", + [PAM_MODULE_UNKNOWN] = "PAM_MODULE_UNKNOWN", + [PAM_DOMAIN_UNKNOWN] = "PAM_DOMAIN_UNKNOWN", + [PAM_BAD_HANDLE] = "PAM_BAD_HANDLE", + [PAM_BAD_ITEM] = "PAM_BAD_ITEM", + [PAM_BAD_FEATURE] = "PAM_BAD_FEATURE", + [PAM_BAD_CONSTANT] = "PAM_BAD_CONSTANT", +}; + +const char *pam_err_text[PAM_NUM_ERRORS] = { + [PAM_SUCCESS] = "Success", + [PAM_OPEN_ERR] = "Failed to load module", + [PAM_SYMBOL_ERR] = "Invalid symbol", + [PAM_SERVICE_ERR] = "Error in service module", + [PAM_SYSTEM_ERR] = "System error", + [PAM_BUF_ERR] = "Memory buffer error", + [PAM_CONV_ERR] = "Conversation failure", + [PAM_PERM_DENIED] = "Permission denied", + [PAM_MAXTRIES] = "Maximum number of tries exceeded", + [PAM_AUTH_ERR] = "Authentication error", + [PAM_NEW_AUTHTOK_REQD] = "New authentication token required", + [PAM_CRED_INSUFFICIENT] = "Insufficient credentials", + [PAM_AUTHINFO_UNAVAIL] = "Authentication information is unavailable", + [PAM_USER_UNKNOWN] = "Unknown user", + [PAM_CRED_UNAVAIL] = "Failed to retrieve user credentials", + [PAM_CRED_EXPIRED] = "User credentials have expired", + [PAM_CRED_ERR] = "Failed to set user credentials", + [PAM_ACCT_EXPIRED] = "User account has expired", + [PAM_AUTHTOK_EXPIRED] = "Password has expired", + [PAM_SESSION_ERR] = "Session failure", + [PAM_AUTHTOK_ERR] = "Authentication token failure", + [PAM_AUTHTOK_RECOVERY_ERR] = "Failed to recover old authentication token", + [PAM_AUTHTOK_LOCK_BUSY] = "Authentication token lock busy", + [PAM_AUTHTOK_DISABLE_AGING] = "Authentication token aging disabled", + [PAM_NO_MODULE_DATA] = "Module data not found", + [PAM_IGNORE] = "Ignore this module", + [PAM_ABORT] = "General failure", + [PAM_TRY_AGAIN] = "Try again", + [PAM_MODULE_UNKNOWN] = "Unknown module type", + [PAM_DOMAIN_UNKNOWN] = "Unknown authentication domain", + [PAM_BAD_HANDLE] = "Invalid PAM handle", + [PAM_BAD_ITEM] = "Unrecognized or restricted item", + [PAM_BAD_FEATURE] = "Unrecognized or restricted feature", + [PAM_BAD_CONSTANT] = "Invalid constant", }; const char *pam_item_name[PAM_NUM_ITEMS] = { - "(NO ITEM)", - "PAM_SERVICE", - "PAM_USER", - "PAM_TTY", - "PAM_RHOST", - "PAM_CONV", - "PAM_AUTHTOK", - "PAM_OLDAUTHTOK", - "PAM_RUSER", - "PAM_USER_PROMPT", - "PAM_REPOSITORY", - "PAM_AUTHTOK_PROMPT", - "PAM_OLDAUTHTOK_PROMPT", - "PAM_HOST", + [PAM_SERVICE] = "PAM_SERVICE", + [PAM_USER] = "PAM_USER", + [PAM_TTY] = "PAM_TTY", + [PAM_RHOST] = "PAM_RHOST", + [PAM_CONV] = "PAM_CONV", + [PAM_AUTHTOK] = "PAM_AUTHTOK", + [PAM_OLDAUTHTOK] = "PAM_OLDAUTHTOK", + [PAM_RUSER] = "PAM_RUSER", + [PAM_USER_PROMPT] = "PAM_USER_PROMPT", + [PAM_REPOSITORY] = "PAM_REPOSITORY", + [PAM_AUTHTOK_PROMPT] = "PAM_AUTHTOK_PROMPT", + [PAM_OLDAUTHTOK_PROMPT] = "PAM_OLDAUTHTOK_PROMPT", + [PAM_HOST] = "PAM_HOST", }; const char *pam_facility_name[PAM_NUM_FACILITIES] = { - [PAM_ACCOUNT] = "account", - [PAM_AUTH] = "auth", - [PAM_PASSWORD] = "password", - [PAM_SESSION] = "session", + [PAM_ACCOUNT] = "account", + [PAM_AUTH] = "auth", + [PAM_PASSWORD] = "password", + [PAM_SESSION] = "session", }; const char *pam_control_flag_name[PAM_NUM_CONTROL_FLAGS] = { - [PAM_BINDING] = "binding", - [PAM_OPTIONAL] = "optional", - [PAM_REQUIRED] = "required", - [PAM_REQUISITE] = "requisite", - [PAM_SUFFICIENT] = "sufficient", + [PAM_BINDING] = "binding", + [PAM_OPTIONAL] = "optional", + [PAM_REQUIRED] = "required", + [PAM_REQUISITE] = "requisite", + [PAM_SUFFICIENT] = "sufficient", }; const char *pam_func_name[PAM_NUM_PRIMITIVES] = { - "pam_authenticate", - "pam_setcred", - "pam_acct_mgmt", - "pam_open_session", - "pam_close_session", - "pam_chauthtok" + [PAM_SM_AUTHENTICATE] = "pam_authenticate", + [PAM_SM_SETCRED] = "pam_setcred", + [PAM_SM_ACCT_MGMT] = "pam_acct_mgmt", + [PAM_SM_OPEN_SESSION] = "pam_open_session", + [PAM_SM_CLOSE_SESSION] = "pam_close_session", + [PAM_SM_CHAUTHTOK] = "pam_chauthtok" }; const char *pam_sm_func_name[PAM_NUM_PRIMITIVES] = { - "pam_sm_authenticate", - "pam_sm_setcred", - "pam_sm_acct_mgmt", - "pam_sm_open_session", - "pam_sm_close_session", - "pam_sm_chauthtok" + [PAM_SM_AUTHENTICATE] = "pam_sm_authenticate", + [PAM_SM_SETCRED] = "pam_sm_setcred", + [PAM_SM_ACCT_MGMT] = "pam_sm_acct_mgmt", + [PAM_SM_OPEN_SESSION] = "pam_sm_open_session", + [PAM_SM_CLOSE_SESSION] = "pam_sm_close_session", + [PAM_SM_CHAUTHTOK] = "pam_sm_chauthtok" }; const char *openpam_policy_path[] = { diff --git a/lib/libpam/openpam_constants.h b/lib/libpam/openpam_constants.h index a42b4fa76f5b..3ff3cd2a8b5f 100644 --- a/lib/libpam/openpam_constants.h +++ b/lib/libpam/openpam_constants.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Dag-Erling Smørgrav + * Copyright (c) 2011-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,13 +26,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_constants.h 659 2013-03-11 14:10:13Z des $ + * $OpenPAM: openpam_constants.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_CONSTANTS_H_INCLUDED #define OPENPAM_CONSTANTS_H_INCLUDED extern const char *pam_err_name[PAM_NUM_ERRORS]; +extern const char *pam_err_text[PAM_NUM_ERRORS]; extern const char *pam_item_name[PAM_NUM_ITEMS]; extern const char *pam_facility_name[PAM_NUM_FACILITIES]; extern const char *pam_control_flag_name[PAM_NUM_CONTROL_FLAGS]; diff --git a/lib/libpam/openpam_cred.h b/lib/libpam/openpam_cred.h index 68e2fd9d1c09..99d634630f0d 100644 --- a/lib/libpam/openpam_cred.h +++ b/lib/libpam/openpam_cred.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_cred.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_cred.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_CRED_H_INCLUDED diff --git a/lib/libpam/openpam_ctype.h b/lib/libpam/openpam_ctype.h index 671c2f5cf8c9..4920e4022c31 100644 --- a/lib/libpam/openpam_ctype.h +++ b/lib/libpam/openpam_ctype.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_ctype.h 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_ctype.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_CTYPE_H_INCLUDED diff --git a/lib/libpam/openpam_debug.h b/lib/libpam/openpam_debug.h index 1fe8346cca8c..d980244444ef 100644 --- a/lib/libpam/openpam_debug.h +++ b/lib/libpam/openpam_debug.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_debug.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_debug.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_DEBUG_H_INCLUDED diff --git a/lib/libpam/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c index 391ce8050d8f..ff4c66ac8b94 100644 --- a/lib/libpam/openpam_dispatch.c +++ b/lib/libpam/openpam_dispatch.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2015 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dispatch.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: openpam_dispatch.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -107,7 +107,7 @@ openpam_dispatch(pam_handle_t *pamh, if (chain->module->func[primitive] == NULL) { openpam_log(PAM_LOG_ERROR, "%s: no %s()", chain->module->path, pam_sm_func_name[primitive]); - r = PAM_SYSTEM_ERR; + r = PAM_SYMBOL_ERR; } else { pamh->primitive = primitive; pamh->current = chain; diff --git a/lib/libpam/openpam_dlfunc.h b/lib/libpam/openpam_dlfunc.h index 6f8724a65d4f..a33de6bee48e 100644 --- a/lib/libpam/openpam_dlfunc.h +++ b/lib/libpam/openpam_dlfunc.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dlfunc.h 872 2015-12-01 19:25:07Z des $ + * $OpenPAM: openpam_dlfunc.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_DLFCN_H_INCLUDED diff --git a/lib/libpam/openpam_dynamic.c b/lib/libpam/openpam_dynamic.c index 27cd4e6776da..6a0f006a6394 100644 --- a/lib/libpam/openpam_dynamic.c +++ b/lib/libpam/openpam_dynamic.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dynamic.c 683 2013-04-14 14:49:59Z des $ + * $OpenPAM: openpam_dynamic.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_features.c b/lib/libpam/openpam_features.c index 387d27bcd384..afffe643fcbc 100644 --- a/lib/libpam/openpam_features.c +++ b/lib/libpam/openpam_features.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_features.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_features.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_features.h b/lib/libpam/openpam_features.h index 00cac1c4b66f..30c0d1a82567 100644 --- a/lib/libpam/openpam_features.h +++ b/lib/libpam/openpam_features.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_features.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_features.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_FEATURES_H_INCLUDED diff --git a/lib/libpam/openpam_findenv.c b/lib/libpam/openpam_findenv.c index 3ad2c845794a..99cdcd134363 100644 --- a/lib/libpam/openpam_findenv.c +++ b/lib/libpam/openpam_findenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_findenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: openpam_findenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_free_data.c b/lib/libpam/openpam_free_data.c index 8f3d852b4905..c4be65cee569 100644 --- a/lib/libpam/openpam_free_data.c +++ b/lib/libpam/openpam_free_data.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_free_envlist.c b/lib/libpam/openpam_free_envlist.c index dda06153205b..e91bc922fd52 100644 --- a/lib/libpam/openpam_free_envlist.c +++ b/lib/libpam/openpam_free_envlist.c @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_get_feature.c b/lib/libpam/openpam_get_feature.c index ad3d9b3ade0f..5f2b66df1541 100644 --- a/lib/libpam/openpam_get_feature.c +++ b/lib/libpam/openpam_get_feature.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_get_feature.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_get_feature.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ openpam_get_feature(int feature, int *onoff) ENTERF(feature); if (feature < 0 || feature >= OPENPAM_NUM_FEATURES) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_FEATURE); *onoff = openpam_features[feature].onoff; RETURNC(PAM_SUCCESS); } @@ -58,7 +58,7 @@ openpam_get_feature(int feature, int *onoff) /* * Error codes: * - * PAM_SYMBOL_ERR + * PAM_BAD_FEATURE */ /** diff --git a/lib/libpam/openpam_get_option.c b/lib/libpam/openpam_get_option.c index 2cf5e87f3f40..3d158d2b1439 100644 --- a/lib/libpam/openpam_get_option.c +++ b/lib/libpam/openpam_get_option.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_get_option.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_get_option.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_impl.h b/lib/libpam/openpam_impl.h index 589a3b325539..ad50bc14d360 100644 --- a/lib/libpam/openpam_impl.h +++ b/lib/libpam/openpam_impl.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2001-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_impl.h 915 2017-02-07 12:03:19Z des $ + * $OpenPAM: openpam_impl.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_IMPL_H_INCLUDED diff --git a/lib/libpam/openpam_load.c b/lib/libpam/openpam_load.c index 614c6fb40938..2edd5efb720f 100644 --- a/lib/libpam/openpam_load.c +++ b/lib/libpam/openpam_load.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_load.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_load.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_log.c b/lib/libpam/openpam_log.c index e52ca95b210c..ecb6758847db 100644 --- a/lib/libpam/openpam_log.c +++ b/lib/libpam/openpam_log.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_log.c 686 2013-07-11 16:36:02Z des $ + * $OpenPAM: openpam_log.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_nullconv.c b/lib/libpam/openpam_nullconv.c index 49c71ba22d82..720b533b6db3 100644 --- a/lib/libpam/openpam_nullconv.c +++ b/lib/libpam/openpam_nullconv.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_nullconv.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_nullconv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_readline.c b/lib/libpam/openpam_readline.c index e3ed9b0a4f01..e43291fbddc6 100644 --- a/lib/libpam/openpam_readline.c +++ b/lib/libpam/openpam_readline.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_readline.c 703 2013-08-16 11:57:54Z des $ + * $OpenPAM: openpam_readline.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c index d73fc5580e8f..a0df81f7cd0e 100644 --- a/lib/libpam/openpam_readlinev.c +++ b/lib/libpam/openpam_readlinev.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_readlinev.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_readlinev.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_readword.c b/lib/libpam/openpam_readword.c index a73b900cbacd..4a58a819ea5a 100644 --- a/lib/libpam/openpam_readword.c +++ b/lib/libpam/openpam_readword.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012-2014 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_readword.c 916 2017-02-07 12:25:58Z des $ + * $OpenPAM: openpam_readword.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_restore_cred.c b/lib/libpam/openpam_restore_cred.c index 8a150cc604e8..59f808b02373 100644 --- a/lib/libpam/openpam_restore_cred.c +++ b/lib/libpam/openpam_restore_cred.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_restore_cred.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_restore_cred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_set_feature.c b/lib/libpam/openpam_set_feature.c index 8e95f3eb057d..f588b179ff27 100644 --- a/lib/libpam/openpam_set_feature.c +++ b/lib/libpam/openpam_set_feature.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_set_feature.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_set_feature.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ openpam_set_feature(int feature, int onoff) ENTERF(feature); if (feature < 0 || feature >= OPENPAM_NUM_FEATURES) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_FEATURE); openpam_features[feature].onoff = onoff; RETURNC(PAM_SUCCESS); } @@ -58,7 +58,7 @@ openpam_set_feature(int feature, int onoff) /* * Error codes: * - * PAM_SYMBOL_ERR + * PAM_BAD_FEATURE */ /** diff --git a/lib/libpam/openpam_set_option.c b/lib/libpam/openpam_set_option.c index 1c06d61d3cc9..e22fb3b492e5 100644 --- a/lib/libpam/openpam_set_option.c +++ b/lib/libpam/openpam_set_option.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_set_option.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_set_option.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_static.c b/lib/libpam/openpam_static.c index 302b3f4c4a86..0816b4cc4a0a 100644 --- a/lib/libpam/openpam_static.c +++ b/lib/libpam/openpam_static.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_static.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_static.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_straddch.c b/lib/libpam/openpam_straddch.c index 522405c0e23b..0bb32d266adf 100644 --- a/lib/libpam/openpam_straddch.c +++ b/lib/libpam/openpam_straddch.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_straddch.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_straddch.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlcat.c b/lib/libpam/openpam_strlcat.c index 64ba9ab00986..0d2fd0989c49 100644 --- a/lib/libpam/openpam_strlcat.c +++ b/lib/libpam/openpam_strlcat.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcat.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcat.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlcat.h b/lib/libpam/openpam_strlcat.h index d09934687970..f561283afd96 100644 --- a/lib/libpam/openpam_strlcat.h +++ b/lib/libpam/openpam_strlcat.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcat.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcat.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLCAT_H_INCLUDED diff --git a/lib/libpam/openpam_strlcmp.h b/lib/libpam/openpam_strlcmp.h index d00383870e2c..2b343b40a138 100644 --- a/lib/libpam/openpam_strlcmp.h +++ b/lib/libpam/openpam_strlcmp.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcmp.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcmp.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLCMP_H_INCLUDED diff --git a/lib/libpam/openpam_strlcpy.c b/lib/libpam/openpam_strlcpy.c index 7a3d142bbcd1..e4c66aefc4c8 100644 --- a/lib/libpam/openpam_strlcpy.c +++ b/lib/libpam/openpam_strlcpy.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcpy.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcpy.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlcpy.h b/lib/libpam/openpam_strlcpy.h index 8260c5627e0d..40d300fb4901 100644 --- a/lib/libpam/openpam_strlcpy.h +++ b/lib/libpam/openpam_strlcpy.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlcpy.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_strlcpy.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLCPY_H_INCLUDED diff --git a/lib/libpam/openpam_strlset.c b/lib/libpam/openpam_strlset.c index febdb5c4ebc8..e3a32dbc033d 100644 --- a/lib/libpam/openpam_strlset.c +++ b/lib/libpam/openpam_strlset.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlset.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_strlset.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_strlset.h b/lib/libpam/openpam_strlset.h index 282a26bdbde2..73bfb61c78db 100644 --- a/lib/libpam/openpam_strlset.h +++ b/lib/libpam/openpam_strlset.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_strlset.h 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_strlset.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_STRLSET_H_INCLUDED diff --git a/lib/libpam/openpam_subst.c b/lib/libpam/openpam_subst.c index 1a4973477dfb..6456aee1442b 100644 --- a/lib/libpam/openpam_subst.c +++ b/lib/libpam/openpam_subst.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_subst.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_subst.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c index 7591eed682bc..8066b3b67298 100644 --- a/lib/libpam/openpam_ttyconv.c +++ b/lib/libpam/openpam_ttyconv.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_ttyconv.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: openpam_ttyconv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_vasprintf.c b/lib/libpam/openpam_vasprintf.c index bedabf4fbd3d..dbdc5c6b1593 100644 --- a/lib/libpam/openpam_vasprintf.c +++ b/lib/libpam/openpam_vasprintf.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_vasprintf.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_vasprintf.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/openpam_vasprintf.h b/lib/libpam/openpam_vasprintf.h index e92ad0d2ce6f..f78b6653167a 100644 --- a/lib/libpam/openpam_vasprintf.h +++ b/lib/libpam/openpam_vasprintf.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_vasprintf.h 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: openpam_vasprintf.h 938 2017-04-30 21:34:42Z des $ */ #ifndef OPENPAM_VASPRINTF_H_INCLUDED diff --git a/lib/libpam/pam_acct_mgmt.c b/lib/libpam/pam_acct_mgmt.c index 87337a80ae6f..8f6426d20bf1 100644 --- a/lib/libpam/pam_acct_mgmt.c +++ b/lib/libpam/pam_acct_mgmt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_acct_mgmt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_authenticate.c b/lib/libpam/pam_authenticate.c index b24e39685d7e..44cb4c86c4a7 100644 --- a/lib/libpam/pam_authenticate.c +++ b/lib/libpam/pam_authenticate.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_authenticate.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_authenticate.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_authenticate(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); pam_set_item(pamh, PAM_AUTHTOK, NULL); RETURNC(r); @@ -72,7 +72,7 @@ pam_authenticate(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_authenticate * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -92,5 +92,5 @@ pam_authenticate(pam_handle_t *pamh, * Fail if the user's authentication token is null. * * If any other bits are set, =pam_authenticate will return - * =PAM_SYMBOL_ERR. + * =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_authenticate_secondary.c b/lib/libpam/pam_authenticate_secondary.c index 9167867833de..02623382f85d 100644 --- a/lib/libpam/pam_authenticate_secondary.c +++ b/lib/libpam/pam_authenticate_secondary.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_authenticate_secondary.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_authenticate_secondary.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_chauthtok.c b/lib/libpam/pam_chauthtok.c index 163fec7cf42f..68790b694dfc 100644 --- a/lib/libpam/pam_chauthtok.c +++ b/lib/libpam/pam_chauthtok.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_chauthtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_chauthtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_chauthtok(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_PRELIM_CHECK); if (r == PAM_SUCCESS) @@ -77,7 +77,7 @@ pam_chauthtok(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_chauthtok * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -93,5 +93,5 @@ pam_chauthtok(pam_handle_t *pamh, * =PAM_CHANGE_EXPIRED_AUTHTOK: * Change only those authentication tokens that have expired. * - * If any other bits are set, =pam_chauthtok will return =PAM_SYMBOL_ERR. + * If any other bits are set, =pam_chauthtok will return =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_close_session.c b/lib/libpam/pam_close_session.c index 8bc1efaebaae..8181c829c224 100644 --- a/lib/libpam/pam_close_session.c +++ b/lib/libpam/pam_close_session.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_close_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_close_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_close_session(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags); RETURNC(r); } @@ -71,7 +71,7 @@ pam_close_session(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_close_session * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -85,5 +85,5 @@ pam_close_session(pam_handle_t *pamh, * Do not emit any messages. * * If any other bits are set, =pam_close_session will return - * =PAM_SYMBOL_ERR. + * =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_end.c b/lib/libpam/pam_end.c index c855b59c4885..04541297d8a6 100644 --- a/lib/libpam/pam_end.c +++ b/lib/libpam/pam_end.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_end.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_end.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,6 +60,8 @@ pam_end(pam_handle_t *pamh, int i; ENTER(); + if (pamh == NULL) + RETURNC(PAM_BAD_HANDLE); /* clear module data */ while ((dp = pamh->module_data) != NULL) { @@ -89,6 +91,12 @@ pam_end(pam_handle_t *pamh, RETURNC(PAM_SUCCESS); } +/* + * Error codes: + * + * PAM_BAD_HANDLE + */ + /** * The =pam_end function terminates a PAM transaction and destroys the * corresponding PAM context, releasing all resources allocated to it. diff --git a/lib/libpam/pam_error.c b/lib/libpam/pam_error.c index cd018f5389e5..cba902a819f1 100644 --- a/lib/libpam/pam_error.c +++ b/lib/libpam/pam_error.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_error.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_error.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c index 83c6b7053fac..6d3dc9c8fa6f 100644 --- a/lib/libpam/pam_get_authtok.c +++ b/lib/libpam/pam_get_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_authtok.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -104,7 +104,7 @@ pam_get_authtok(pam_handle_t *pamh, twice = 0; break; default: - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); } if (openpam_get_option(pamh, "try_first_pass") || openpam_get_option(pamh, "use_first_pass")) { @@ -170,6 +170,7 @@ pam_get_authtok(pam_handle_t *pamh, * =pam_prompt * =pam_set_item * !PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT * PAM_TRY_AGAIN */ diff --git a/lib/libpam/pam_get_data.c b/lib/libpam/pam_get_data.c index a2f5072cb374..1db50c071ca4 100644 --- a/lib/libpam/pam_get_data.c +++ b/lib/libpam/pam_get_data.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_data.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_data.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_item.c b/lib/libpam/pam_get_item.c index e28012ea2672..6babd0fc7aa8 100644 --- a/lib/libpam/pam_get_item.c +++ b/lib/libpam/pam_get_item.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_item.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_item.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -76,14 +76,14 @@ pam_get_item(const pam_handle_t *pamh, *item = pamh->item[item_type]; RETURNC(PAM_SUCCESS); default: - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_ITEM); } } /* * Error codes: * - * PAM_SYMBOL_ERR + * PAM_BAD_ITEM */ /** diff --git a/lib/libpam/pam_get_mapped_authtok.c b/lib/libpam/pam_get_mapped_authtok.c index 871405efb5dc..01c283f32cbe 100644 --- a/lib/libpam/pam_get_mapped_authtok.c +++ b/lib/libpam/pam_get_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_get_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_mapped_username.c b/lib/libpam/pam_get_mapped_username.c index 25305d2ac55c..05a9a4c4337d 100644 --- a/lib/libpam/pam_get_mapped_username.c +++ b/lib/libpam/pam_get_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_get_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_get_user.c b/lib/libpam/pam_get_user.c index f3fc4b60b8f2..7b1bd66b5316 100644 --- a/lib/libpam/pam_get_user.c +++ b/lib/libpam/pam_get_user.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_get_user.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_get_user.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_getenv.c b/lib/libpam/pam_getenv.c index 1e034468fbc2..c3bbcd8eac2f 100644 --- a/lib/libpam/pam_getenv.c +++ b/lib/libpam/pam_getenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_getenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_getenvlist.c b/lib/libpam/pam_getenvlist.c index 4139c2fb4d31..5b660e6b2bd3 100644 --- a/lib/libpam/pam_getenvlist.c +++ b/lib/libpam/pam_getenvlist.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_getenvlist.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_getenvlist.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -63,7 +63,7 @@ pam_getenvlist(pam_handle_t *pamh) envlist = malloc(sizeof(char *) * (pamh->env_count + 1)); if (envlist == NULL) { openpam_log(PAM_LOG_ERROR, "%s", - pam_strerror(pamh, PAM_BUF_ERR)); + pam_err_text[PAM_BUF_ERR]); RETURNP(NULL); } for (i = 0; i < pamh->env_count; ++i) { @@ -74,7 +74,7 @@ pam_getenvlist(pam_handle_t *pamh) } FREE(envlist); openpam_log(PAM_LOG_ERROR, "%s", - pam_strerror(pamh, PAM_BUF_ERR)); + pam_err_text[PAM_BUF_ERR]); RETURNP(NULL); } } diff --git a/lib/libpam/pam_info.c b/lib/libpam/pam_info.c index 550bb76c9594..d417c6864ba9 100644 --- a/lib/libpam/pam_info.c +++ b/lib/libpam/pam_info.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_info.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_info.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_open_session.c b/lib/libpam/pam_open_session.c index de12705088eb..43da3ffe44c5 100644 --- a/lib/libpam/pam_open_session.c +++ b/lib/libpam/pam_open_session.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_open_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_open_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -60,7 +60,7 @@ pam_open_session(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); r = openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags); RETURNC(r); } @@ -71,7 +71,7 @@ pam_open_session(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_open_session * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -86,5 +86,5 @@ pam_open_session(pam_handle_t *pamh, * Do not emit any messages. * * If any other bits are set, =pam_open_session will return - * =PAM_SYMBOL_ERR. + * =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_prompt.c b/lib/libpam/pam_prompt.c index e3ba0f2b90e7..78b93402ce2a 100644 --- a/lib/libpam/pam_prompt.c +++ b/lib/libpam/pam_prompt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_prompt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_prompt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_putenv.c b/lib/libpam/pam_putenv.c index 605277fda6f4..2f3c936e1af8 100644 --- a/lib/libpam/pam_putenv.c +++ b/lib/libpam/pam_putenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_putenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: pam_putenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_set_data.c b/lib/libpam/pam_set_data.c index 6a26b6fb02e0..84871c17ccc0 100644 --- a/lib/libpam/pam_set_data.c +++ b/lib/libpam/pam_set_data.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_data.c 913 2017-01-21 15:11:12Z des $ + * $OpenPAM: pam_set_data.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_set_item.c b/lib/libpam/pam_set_item.c index 0e8f76f7fa6b..02c6b49b3d27 100644 --- a/lib/libpam/pam_set_item.c +++ b/lib/libpam/pam_set_item.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_item.c 918 2017-02-19 17:46:22Z des $ + * $OpenPAM: pam_set_item.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -70,7 +70,7 @@ pam_set_item(pam_handle_t *pamh, case PAM_SERVICE: /* set once only, by pam_start() */ if (*slot != NULL && item != NULL) - RETURNC(PAM_SYSTEM_ERR); + RETURNC(PAM_BAD_ITEM); /* fall through */ case PAM_USER: case PAM_AUTHTOK: @@ -94,7 +94,7 @@ pam_set_item(pam_handle_t *pamh, osize = nsize = sizeof(struct pam_conv); break; default: - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_ITEM); } if (*slot != NULL) { memset(*slot, 0xd0, osize); @@ -113,8 +113,7 @@ pam_set_item(pam_handle_t *pamh, /* * Error codes: * - * PAM_SYMBOL_ERR - * PAM_SYSTEM_ERR + * PAM_BAD_ITEM * PAM_BUF_ERR */ diff --git a/lib/libpam/pam_set_mapped_authtok.c b/lib/libpam/pam_set_mapped_authtok.c index c8fbd91b4aac..fa3d2fa4fdf4 100644 --- a/lib/libpam/pam_set_mapped_authtok.c +++ b/lib/libpam/pam_set_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_set_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_set_mapped_username.c b/lib/libpam/pam_set_mapped_username.c index 8f62f53d235d..ee8813b1e973 100644 --- a/lib/libpam/pam_set_mapped_username.c +++ b/lib/libpam/pam_set_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_set_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_set_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_setcred.c b/lib/libpam/pam_setcred.c index 7a691765573b..eb71ba808a84 100644 --- a/lib/libpam/pam_setcred.c +++ b/lib/libpam/pam_setcred.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_setcred.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_setcred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -61,7 +61,7 @@ pam_setcred(pam_handle_t *pamh, ENTER(); if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) - RETURNC(PAM_SYMBOL_ERR); + RETURNC(PAM_BAD_CONSTANT); /* XXX enforce exclusivity */ r = openpam_dispatch(pamh, PAM_SM_SETCRED, flags); RETURNC(r); @@ -73,7 +73,7 @@ pam_setcred(pam_handle_t *pamh, * =openpam_dispatch * =pam_sm_setcred * !PAM_IGNORE - * PAM_SYMBOL_ERR + * PAM_BAD_CONSTANT */ /** @@ -95,5 +95,5 @@ pam_setcred(pam_handle_t *pamh, * * The latter four are mutually exclusive. * - * If any other bits are set, =pam_setcred will return =PAM_SYMBOL_ERR. + * If any other bits are set, =pam_setcred will return =PAM_BAD_CONSTANT. */ diff --git a/lib/libpam/pam_setenv.c b/lib/libpam/pam_setenv.c index 3c2209c1c0dd..f05faf236608 100644 --- a/lib/libpam/pam_setenv.c +++ b/lib/libpam/pam_setenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_setenv.c 914 2017-01-21 15:15:29Z des $ + * $OpenPAM: pam_setenv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_acct_mgmt.c b/lib/libpam/pam_sm_acct_mgmt.c index 6420fbac0fb2..0919c26bd54d 100644 --- a/lib/libpam/pam_sm_acct_mgmt.c +++ b/lib/libpam/pam_sm_acct_mgmt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_acct_mgmt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_authenticate.c b/lib/libpam/pam_sm_authenticate.c index f31b6ac2db24..79c134866d87 100644 --- a/lib/libpam/pam_sm_authenticate.c +++ b/lib/libpam/pam_sm_authenticate.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_authenticate.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_authenticate.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_authenticate_secondary.c b/lib/libpam/pam_sm_authenticate_secondary.c index 4a232fbd0fcb..295614296571 100644 --- a/lib/libpam/pam_sm_authenticate_secondary.c +++ b/lib/libpam/pam_sm_authenticate_secondary.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_authenticate_secondary.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_authenticate_secondary.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_chauthtok.c b/lib/libpam/pam_sm_chauthtok.c index 4f17562af288..fcf6542628b3 100644 --- a/lib/libpam/pam_sm_chauthtok.c +++ b/lib/libpam/pam_sm_chauthtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_chauthtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_chauthtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_close_session.c b/lib/libpam/pam_sm_close_session.c index 9247d8f5b1fc..ffd78fc2abaa 100644 --- a/lib/libpam/pam_sm_close_session.c +++ b/lib/libpam/pam_sm_close_session.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_close_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_close_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_get_mapped_authtok.c b/lib/libpam/pam_sm_get_mapped_authtok.c index 473a52e7742e..f5fba4ec6770 100644 --- a/lib/libpam/pam_sm_get_mapped_authtok.c +++ b/lib/libpam/pam_sm_get_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_get_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_get_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_get_mapped_username.c b/lib/libpam/pam_sm_get_mapped_username.c index 6de9fdb46437..286f6e4a444d 100644 --- a/lib/libpam/pam_sm_get_mapped_username.c +++ b/lib/libpam/pam_sm_get_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_get_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_get_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_open_session.c b/lib/libpam/pam_sm_open_session.c index a576a00b1af9..293d40aadef2 100644 --- a/lib/libpam/pam_sm_open_session.c +++ b/lib/libpam/pam_sm_open_session.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_open_session.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_open_session.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_set_mapped_authtok.c b/lib/libpam/pam_sm_set_mapped_authtok.c index de0e91f86e5d..afcb55928198 100644 --- a/lib/libpam/pam_sm_set_mapped_authtok.c +++ b/lib/libpam/pam_sm_set_mapped_authtok.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_set_mapped_authtok.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_set_mapped_authtok.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_set_mapped_username.c b/lib/libpam/pam_sm_set_mapped_username.c index 2696d3e182ec..ed844c3385a8 100644 --- a/lib/libpam/pam_sm_set_mapped_username.c +++ b/lib/libpam/pam_sm_set_mapped_username.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_set_mapped_username.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_set_mapped_username.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_sm_setcred.c b/lib/libpam/pam_sm_setcred.c index 0836adc54f8e..1926c5664031 100644 --- a/lib/libpam/pam_sm_setcred.c +++ b/lib/libpam/pam_sm_setcred.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_sm_setcred.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_sm_setcred.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_start.c b/lib/libpam/pam_start.c index 03fae416cad6..6605d9179ce2 100644 --- a/lib/libpam/pam_start.c +++ b/lib/libpam/pam_start.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_start.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_start.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_strerror.c b/lib/libpam/pam_strerror.c index 8621ad6c3dd4..2f6fd70a25ba 100644 --- a/lib/libpam/pam_strerror.c +++ b/lib/libpam/pam_strerror.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2011 Dag-Erling Smørgrav + * Copyright (c) 2004-2017 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_strerror.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_strerror.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -59,69 +59,9 @@ pam_strerror(const pam_handle_t *pamh, static char unknown[16]; (void)pamh; - - switch (error_number) { - case PAM_SUCCESS: - return ("success"); - case PAM_OPEN_ERR: - return ("failed to load module"); - case PAM_SYMBOL_ERR: - return ("invalid symbol"); - case PAM_SERVICE_ERR: - return ("error in service module"); - case PAM_SYSTEM_ERR: - return ("system error"); - case PAM_BUF_ERR: - return ("memory buffer error"); - case PAM_CONV_ERR: - return ("conversation failure"); - case PAM_PERM_DENIED: - return ("permission denied"); - case PAM_MAXTRIES: - return ("maximum number of tries exceeded"); - case PAM_AUTH_ERR: - return ("authentication error"); - case PAM_NEW_AUTHTOK_REQD: - return ("new authentication token required"); - case PAM_CRED_INSUFFICIENT: - return ("insufficient credentials"); - case PAM_AUTHINFO_UNAVAIL: - return ("authentication information is unavailable"); - case PAM_USER_UNKNOWN: - return ("unknown user"); - case PAM_CRED_UNAVAIL: - return ("failed to retrieve user credentials"); - case PAM_CRED_EXPIRED: - return ("user credentials have expired"); - case PAM_CRED_ERR: - return ("failed to set user credentials"); - case PAM_ACCT_EXPIRED: - return ("user account has expired"); - case PAM_AUTHTOK_EXPIRED: - return ("password has expired"); - case PAM_SESSION_ERR: - return ("session failure"); - case PAM_AUTHTOK_ERR: - return ("authentication token failure"); - case PAM_AUTHTOK_RECOVERY_ERR: - return ("failed to recover old authentication token"); - case PAM_AUTHTOK_LOCK_BUSY: - return ("authentication token lock busy"); - case PAM_AUTHTOK_DISABLE_AGING: - return ("authentication token aging disabled"); - case PAM_NO_MODULE_DATA: - return ("module data not found"); - case PAM_IGNORE: - return ("ignore this module"); - case PAM_ABORT: - return ("general failure"); - case PAM_TRY_AGAIN: - return ("try again"); - case PAM_MODULE_UNKNOWN: - return ("unknown module type"); - case PAM_DOMAIN_UNKNOWN: - return ("unknown authentication domain"); - default: + if (error_number >= 0 && error_number < PAM_NUM_ERRORS) { + return (pam_err_text[error_number]); + } else { snprintf(unknown, sizeof unknown, "#%d", error_number); return (unknown); } diff --git a/lib/libpam/pam_verror.c b/lib/libpam/pam_verror.c index 683abbc0b2fb..67950cf71159 100644 --- a/lib/libpam/pam_verror.c +++ b/lib/libpam/pam_verror.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_verror.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_verror.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_vinfo.c b/lib/libpam/pam_vinfo.c index 3ae2c7faa19a..3e027914630a 100644 --- a/lib/libpam/pam_vinfo.c +++ b/lib/libpam/pam_vinfo.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_vinfo.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_vinfo.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/lib/libpam/pam_vprompt.c b/lib/libpam/pam_vprompt.c index eb337af0dc06..982e6ae5a5ce 100644 --- a/lib/libpam/pam_vprompt.c +++ b/lib/libpam/pam_vprompt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_vprompt.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_vprompt.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/misc/gendoc.pl b/misc/gendoc.pl index 3202dc6f5529..b8e6c96af428 100644 --- a/misc/gendoc.pl +++ b/misc/gendoc.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #- # Copyright (c) 2002-2003 Networks Associates Technology, Inc. -# Copyright (c) 2004-2014 Dag-Erling Smørgrav +# Copyright (c) 2004-2017 Dag-Erling Smørgrav # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS and @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: gendoc.pl 910 2017-01-21 12:22:08Z des $ +# $OpenPAM: gendoc.pl 938 2017-04-30 21:34:42Z des $ # use strict; @@ -93,6 +93,10 @@ The OpenPAM library is maintained by PAM_TRY_AGAIN => "Try again", PAM_MODULE_UNKNOWN => "Unknown module type", PAM_DOMAIN_UNKNOWN => "Unknown authentication domain", + PAM_BAD_HANDLE => "Invalid PAM handle", + PAM_BAD_ITEM => "Unrecognized or restricted item", + PAM_BAD_FEATURE => "Unrecognized or restricted feature", + PAM_BAD_CONSTANT => "Bad constant", ); sub parse_source($) { @@ -114,7 +118,7 @@ sub parse_source($) { my $experimental; my $version; my %xref; - my @errors; + my %errors; my $author; if ($fn !~ m,\.c$,) { @@ -130,7 +134,7 @@ sub parse_source($) { return undef if ($source =~ m/^ \* NOPARSE\s*$/m); - if ($source =~ m/(\$Id:[^\$]+\$)/) { + if ($source =~ m/(\$OpenPAM:[^\$]+\$)/) { $version = $1; } @@ -168,8 +172,8 @@ sub parse_source($) { if ($type eq "int") { foreach (split("\n", $source)) { - next unless (m/^ \*\s+(!?PAM_[A-Z_]+|=[a-z_]+)\s*$/); - push(@errors, $1); + next unless (m/^ \*\t(!?PAM_[A-Z_]+|=[a-z_]+)\s*(.*?)\s*$/); + $errors{$1} = $2; } ++$xref{3}->{pam_strerror}; } @@ -335,7 +339,7 @@ sub parse_source($) { 'args' => $args, 'man' => $man, 'xref' => \%xref, - 'errors' => \@errors, + 'errors' => \%errors, 'author' => $author, 'customrv' => $customrv, 'deprecated' => $deprecated, @@ -365,13 +369,13 @@ sub expand_errors($) { } $$func{recursed} = 1; - foreach (@{$$func{errors}}) { + foreach (keys %{$$func{errors}}) { if (m/^(PAM_[A-Z_]+)$/) { if (!defined($PAMERR{$1})) { warn("$$func{name}(): unrecognized error: $1\n"); next; } - $errors{$1} = 1; + $errors{$1} = $$func{errors}->{$_}; } elsif (m/^!(PAM_[A-Z_]+)$/) { # treat negations separately } elsif (m/^=([a-z_]+)$/) { @@ -385,20 +389,20 @@ sub expand_errors($) { warn("$$func{name}(): reference to unknown $ref()\n"); next; } - foreach (@{$FUNCTIONS{$ref}->{errors}}) { - $errors{$_} = 1; + foreach (keys %{$FUNCTIONS{$ref}->{errors}}) { + $errors{$_} //= $FUNCTIONS{$ref}->{errors}->{$_}; } } else { warn("$$func{name}(): invalid error specification: $_\n"); } } - foreach (@{$$func{errors}}) { + foreach (keys %{$$func{errors}}) { if (m/^!(PAM_[A-Z_]+)$/) { delete($errors{$1}); } } delete($$func{recursed}); - $$func{errors} = [ sort(keys(%errors)) ]; + $$func{errors} = \%errors; } sub dictionary_order($$) { @@ -430,6 +434,7 @@ sub gendoc($) { my $func = shift; # Ref to function hash local *FILE; + my %errors; my $mdoc; my $fn; @@ -489,18 +494,21 @@ sub gendoc($) { $mdoc .= ".Ef\n.Pp\n"; } $mdoc .= "$$func{man}\n"; - my @errors = @{$$func{errors}}; + %errors = %{$$func{errors}}; if ($$func{customrv}) { # leave it - } elsif ($$func{type} eq "int" && @errors) { + } elsif ($$func{type} eq "int" && %errors) { $mdoc .= ".Sh RETURN VALUES The .Fn $$func{name} function returns one of the following values: .Bl -tag -width 18n "; - foreach (@errors) { - $mdoc .= ".It Bq Er $_\n$PAMERR{$_}.\n"; + delete($errors{PAM_SUCCESS}); + foreach ('PAM_SUCCESS', sort keys %errors) { + $mdoc .= ".It Bq Er $_\n" . + ($errors{$_} || $PAMERR{$_}) . + ".\n"; } $mdoc .= ".El\n"; } elsif ($$func{type} eq "int") { diff --git a/mkpkgng.in b/mkpkgng.in index 3c57b7dc184f..da4e75919bef 100644 --- a/mkpkgng.in +++ b/mkpkgng.in @@ -27,7 +27,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: mkpkgng.in 890 2016-01-11 16:22:09Z des $ +# $OpenPAM: mkpkgng.in 938 2017-04-30 21:34:42Z des $ # # Print an informational message diff --git a/modules/Makefile.am b/modules/Makefile.am index 2ce129e5175c..99dd788c9d4d 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ SUBDIRS = pam_deny pam_permit pam_return diff --git a/modules/Makefile.in b/modules/Makefile.in index 172cda967b8f..683fe342cd36 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 907 2017-01-18 09:39:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am index d48418cf258c..f2b4fcb07e8a 100644 --- a/modules/pam_deny/Makefile.am +++ b/modules/pam_deny/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ if CUSTOM_MODULES_DIR moduledir = $(OPENPAM_MODULES_DIR) diff --git a/modules/pam_deny/Makefile.in b/modules/pam_deny/Makefile.in index 17437e8e3ad1..7f92f93fef04 100644 --- a/modules/pam_deny/Makefile.in +++ b/modules/pam_deny/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/modules/pam_deny/pam_deny.c b/modules/pam_deny/pam_deny.c index d6983c5a3521..e0b1762bd200 100644 --- a/modules/pam_deny/pam_deny.c +++ b/modules/pam_deny/pam_deny.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_deny.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_deny.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am index b058c1e1aa02..faec653ccf59 100644 --- a/modules/pam_permit/Makefile.am +++ b/modules/pam_permit/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ if CUSTOM_MODULES_DIR moduledir = $(OPENPAM_MODULES_DIR) diff --git a/modules/pam_permit/Makefile.in b/modules/pam_permit/Makefile.in index ab3587037924..dbe448aaaa95 100644 --- a/modules/pam_permit/Makefile.in +++ b/modules/pam_permit/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/modules/pam_permit/pam_permit.c b/modules/pam_permit/pam_permit.c index f42b6c1a95ca..454853456d75 100644 --- a/modules/pam_permit/pam_permit.c +++ b/modules/pam_permit/pam_permit.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_permit.c 648 2013-03-05 17:54:27Z des $ + * $OpenPAM: pam_permit.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/modules/pam_return/Makefile.am b/modules/pam_return/Makefile.am index 33e67262596a..eaecc212fb04 100644 --- a/modules/pam_return/Makefile.am +++ b/modules/pam_return/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 873 2015-12-01 19:38:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ if CUSTOM_MODULES_DIR moduledir = $(OPENPAM_MODULES_DIR) diff --git a/modules/pam_return/Makefile.in b/modules/pam_return/Makefile.in index cbb884be8565..47c52cb5cb07 100644 --- a/modules/pam_return/Makefile.in +++ b/modules/pam_return/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 873 2015-12-01 19:38:01Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/modules/pam_return/pam_return.c b/modules/pam_return/pam_return.c index 9455e338cc8e..dcbfe95b8268 100644 --- a/modules/pam_return/pam_return.c +++ b/modules/pam_return/pam_return.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_return.c 873 2015-12-01 19:38:01Z des $ + * $OpenPAM: pam_return.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am index a1c97c737cec..418f31524462 100644 --- a/modules/pam_unix/Makefile.am +++ b/modules/pam_unix/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ if CUSTOM_MODULES_DIR moduledir = $(OPENPAM_MODULES_DIR) diff --git a/modules/pam_unix/Makefile.in b/modules/pam_unix/Makefile.in index 1a2507d9bd80..fda413dd5515 100644 --- a/modules/pam_unix/Makefile.in +++ b/modules/pam_unix/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 834 2014-10-28 10:25:58Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/modules/pam_unix/pam_unix.c b/modules/pam_unix/pam_unix.c index 06d020bc3a22..ab8134d7a85b 100644 --- a/modules/pam_unix/pam_unix.c +++ b/modules/pam_unix/pam_unix.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pam_unix.c 890 2016-01-11 16:22:09Z des $ + * $OpenPAM: pam_unix.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H diff --git a/t/Makefile.am b/t/Makefile.am index 9c538a4dd959..55fdb48b7e68 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 922 2017-02-19 19:28:30Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ if WITH_TEST diff --git a/t/Makefile.in b/t/Makefile.in index 119d686e9c00..002fdd8404fa 100644 --- a/t/Makefile.in +++ b/t/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 922 2017-02-19 19:28:30Z des $ +# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ diff --git a/t/t_openpam_ctype.c b/t/t_openpam_ctype.c index 3fd617d4c7af..ec7e807d0e60 100644 --- a/t/t_openpam_ctype.c +++ b/t/t_openpam_ctype.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014-2015 Dag-Erling Smørgrav + * Copyright (c) 2014-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: t_openpam_ctype.c 922 2017-02-19 19:28:30Z des $ + * $OpenPAM: t_openpam_ctype.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -75,7 +75,7 @@ static const char oc_pfcs[] = OC_PFCS; crib[(int)oc_##set[i]] = 1; \ for (i = ret = 0; i < sizeof crib; ++i) { \ if (is_##set(i) != crib[i]) { \ - t_verbose("is_%s() incorrect " \ + t_printv("is_%s() incorrect " \ "for %#02x\n", #set, i); \ ++ret; \ } \ diff --git a/t/t_openpam_dispatch.c b/t/t_openpam_dispatch.c index f198a994e63e..f2f3053a726c 100644 --- a/t/t_openpam_dispatch.c +++ b/t/t_openpam_dispatch.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015 Dag-Erling Smørgrav + * Copyright (c) 2015-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: t_openpam_dispatch.c 922 2017-02-19 19:28:30Z des $ + * $OpenPAM: t_openpam_dispatch.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -54,7 +54,7 @@ OPENPAM_UNUSED(void *arg)) #define T(n) \ - t_add_test(&t_ ## n ## _func, NULL, t_ ## n ## _desc) + t_add_test(&t_ ## n ## _func, NULL, "%s", t_ ## n ## _desc) const char *pam_return_so; @@ -73,7 +73,7 @@ T_FUNC(empty_policy, "empty policy") t_fprintf(tf, "# empty policy\n"); pam_err = pam_start(tf->name, "test", &pamc, &pamh); if (pam_err != PAM_SUCCESS) { - t_verbose("pam_start() returned %d\n", pam_err); + t_printv("pam_start() returned %d\n", pam_err); return (0); } /* @@ -82,22 +82,22 @@ T_FUNC(empty_policy, "empty policy") * instead. */ pam_err = pam_authenticate(pamh, 0); - t_verbose("pam_authenticate() returned %d\n", pam_err); + t_printv("pam_authenticate() returned %d\n", pam_err); ret = (pam_err == PAM_SYSTEM_ERR); pam_err = pam_setcred(pamh, 0); - t_verbose("pam_setcred() returned %d\n", pam_err); + t_printv("pam_setcred() returned %d\n", pam_err); ret &= (pam_err == PAM_SYSTEM_ERR); pam_err = pam_acct_mgmt(pamh, 0); - t_verbose("pam_acct_mgmt() returned %d\n", pam_err); + t_printv("pam_acct_mgmt() returned %d\n", pam_err); ret &= (pam_err == PAM_SYSTEM_ERR); pam_err = pam_chauthtok(pamh, 0); - t_verbose("pam_chauthtok() returned %d\n", pam_err); + t_printv("pam_chauthtok() returned %d\n", pam_err); ret &= (pam_err == PAM_SYSTEM_ERR); pam_err = pam_open_session(pamh, 0); - t_verbose("pam_open_session() returned %d\n", pam_err); + t_printv("pam_open_session() returned %d\n", pam_err); ret &= (pam_err == PAM_SYSTEM_ERR); pam_err = pam_close_session(pamh, 0); - t_verbose("pam_close_session() returned %d\n", pam_err); + t_printv("pam_close_session() returned %d\n", pam_err); ret &= (pam_err == PAM_SYSTEM_ERR); pam_end(pamh, pam_err); t_fclose(tf); @@ -150,7 +150,7 @@ T_FUNC(mod_return, "module return value") } pam_err = pam_start(tf->name, "test", &pamc, &pamh); if (pam_err != PAM_SUCCESS) { - t_verbose("pam_start() returned %d\n", pam_err); + t_printv("pam_start() returned %d\n", pam_err); t_fclose(tf); continue; } @@ -174,10 +174,10 @@ T_FUNC(mod_return, "module return value") pam_err = pam_chauthtok(pamh, tc->flags); break; } - t_verbose("%s returned %d\n", + t_printv("%s returned %d\n", pam_func_name[tc->primitive], pam_err); pam_end(pamh, pam_err); - t_verbose("here\n"); + t_printv("here\n"); t_fclose(tf); } return (1); @@ -196,7 +196,7 @@ t_prepare(int argc, char *argv[]) (void)argv; if ((pam_return_so = getenv("PAM_RETURN_SO")) == NULL) { - t_verbose("define PAM_RETURN_SO before running these tests\n"); + t_printv("define PAM_RETURN_SO before running these tests\n"); return (0); } diff --git a/t/t_openpam_readlinev.c b/t/t_openpam_readlinev.c index abc29e26cd55..e32f33879453 100644 --- a/t/t_openpam_readlinev.c +++ b/t/t_openpam_readlinev.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012-2015 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: t_openpam_readlinev.c 922 2017-02-19 19:28:30Z des $ + * $OpenPAM: t_openpam_readlinev.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -52,7 +52,7 @@ OPENPAM_UNUSED(void *arg)) #define T(n) \ - t_add_test(&t_ ## n ## _func, NULL, t_ ## n ## _desc) + t_add_test(&t_ ## n ## _func, NULL, "%s", t_ ## n ## _desc) /* * Read a line from the temp file and verify that the result matches our @@ -76,20 +76,20 @@ orlv_expect(struct t_file *tf, const char **expectedv, int lines, int eof) if (t_ferror(tf)) err(1, "%s(): %s", __func__, tf->name); if (expectedv != NULL && gotv == NULL) { - t_verbose("expected %d words, got nothing\n", expectedc); + t_printv("expected %d words, got nothing\n", expectedc); ret = 0; } else if (expectedv == NULL && gotv != NULL) { - t_verbose("expected nothing, got %d words\n", gotc); + t_printv("expected nothing, got %d words\n", gotc); ret = 0; } else if (expectedv != NULL && gotv != NULL) { if (expectedc != gotc) { - t_verbose("expected %d words, got %d\n", + t_printv("expected %d words, got %d\n", expectedc, gotc); ret = 0; } for (i = 0; i < gotc; ++i) { if (strcmp(expectedv[i], gotv[i]) != 0) { - t_verbose("word %d: expected <<%s>>, " + t_printv("word %d: expected <<%s>>, " "got <<%s>>\n", i, expectedv[i], gotv[i]); ret = 0; } @@ -97,15 +97,15 @@ orlv_expect(struct t_file *tf, const char **expectedv, int lines, int eof) } FREEV(gotc, gotv); if (lineno != lines) { - t_verbose("expected to advance %d lines, advanced %d lines\n", + t_printv("expected to advance %d lines, advanced %d lines\n", lines, lineno); ret = 0; } if (eof && !t_feof(tf)) { - t_verbose("expected EOF, but didn't get it\n"); + t_printv("expected EOF, but didn't get it\n"); ret = 0; } else if (!eof && t_feof(tf)) { - t_verbose("didn't expect EOF, but got it anyway\n"); + t_printv("didn't expect EOF, but got it anyway\n"); ret = 0; } return (ret); diff --git a/t/t_openpam_readword.c b/t/t_openpam_readword.c index 767696e52a55..e7e9871f45ca 100644 --- a/t/t_openpam_readword.c +++ b/t/t_openpam_readword.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012-2015 Dag-Erling Smørgrav + * Copyright (c) 2012-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: t_openpam_readword.c 922 2017-02-19 19:28:30Z des $ + * $OpenPAM: t_openpam_readword.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -34,6 +34,7 @@ #endif #include +#include #include #include #include @@ -50,7 +51,7 @@ OPENPAM_UNUSED(void *arg)) #define T(n) \ - t_add_test(&t_ ## n ## _func, NULL, t_ ## n ## _desc) + t_add_test(&t_ ## n ## _func, NULL, "%s", t_ ## n ## _desc) /* * Read a word from the temp file and verify that the result matches our @@ -71,37 +72,37 @@ orw_expect(struct t_file *tf, const char *expected, int lines, int eof, int eol) if (t_ferror(tf)) err(1, "%s(): %s", __func__, tf->name); if (expected != NULL && got == NULL) { - t_verbose("expected <<%s>>, got nothing\n", expected); + t_printv("expected <<%s>>, got nothing\n", expected); ret = 0; } else if (expected == NULL && got != NULL) { - t_verbose("expected nothing, got <<%s>>\n", got); + t_printv("expected nothing, got <<%s>>\n", got); ret = 0; } else if (expected != NULL && got != NULL && strcmp(expected, got) != 0) { - t_verbose("expected <<%s>>, got <<%s>>\n", expected, got); + t_printv("expected <<%s>>, got <<%s>>\n", expected, got); ret = 0; } free(got); if (lineno != lines) { - t_verbose("expected to advance %d lines, advanced %d lines\n", + t_printv("expected to advance %d lines, advanced %d lines\n", lines, lineno); ret = 0; } if (eof && !t_feof(tf)) { - t_verbose("expected EOF, but didn't get it\n"); + t_printv("expected EOF, but didn't get it\n"); ret = 0; } if (!eof && t_feof(tf)) { - t_verbose("didn't expect EOF, but got it anyway\n"); + t_printv("didn't expect EOF, but got it anyway\n"); ret = 0; } ch = fgetc(tf->file); if (t_ferror(tf)) err(1, "%s(): %s", __func__, tf->name); if (eol && ch != '\n') { - t_verbose("expected EOL, but didn't get it\n"); + t_printv("expected EOL, but didn't get it\n"); ret = 0; } else if (!eol && ch == '\n') { - t_verbose("didn't expect EOL, but got it anyway\n"); + t_printv("didn't expect EOL, but got it anyway\n"); ret = 0; } if (ch != EOF) diff --git a/t/t_pam_conv.c b/t/t_pam_conv.c index 58e5c086c1b5..243d96df3f76 100644 --- a/t/t_pam_conv.c +++ b/t/t_pam_conv.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015 Dag-Erling Smørgrav + * Copyright (c) 2015-2017 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: t_pam_conv.c 922 2017-02-19 19:28:30Z des $ + * $OpenPAM: t_pam_conv.c 938 2017-04-30 21:34:42Z des $ */ #ifdef HAVE_CONFIG_H @@ -99,16 +99,16 @@ t_pam_conv(int nm, const struct pam_message **msgs, } switch (msgs[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: - t_verbose("[PAM_PROMPT_ECHO_OFF] %s\n", msgs[i]->msg); + t_printv("[PAM_PROMPT_ECHO_OFF] %s\n", msgs[i]->msg); break; case PAM_PROMPT_ECHO_ON: - t_verbose("[PAM_PROMPT_ECHO_ON] %s\n", msgs[i]->msg); + t_printv("[PAM_PROMPT_ECHO_ON] %s\n", msgs[i]->msg); break; case PAM_ERROR_MSG: - t_verbose("[PAM_ERROR_MSG] %s\n", msgs[i]->msg); + t_printv("[PAM_ERROR_MSG] %s\n", msgs[i]->msg); break; case PAM_TEXT_INFO: - t_verbose("[PAM_TEXT_INFO] %s\n", msgs[i]->msg); + t_printv("[PAM_TEXT_INFO] %s\n", msgs[i]->msg); break; default: asprintf(&s->comment, "invalid message style %d", diff --git a/t/t_pam_conv.h b/t/t_pam_conv.h index ab0749744594..07ba702c940a 100644 --- a/t/t_pam_conv.h +++ b/t/t_pam_conv.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: t_pam_conv.h 863 2015-07-30 23:44:31Z des $ + * $OpenPAM: t_pam_conv.h 938 2017-04-30 21:34:42Z des $ */ #ifndef T_PAM_CONV_H_INCLUDED From f01310bcd9ca900e7c979ded38897c928718fe98 Mon Sep 17 00:00:00 2001 From: des Date: Sun, 24 Feb 2019 20:54:06 +0000 Subject: [PATCH 02/16] Vendor import of OpenPAM Tabebuia. --- CREDITS | 1 + HISTORY | 9 +- LICENSE | 2 +- Makefile.in | 39 +- RELNOTES | 4 +- aclocal.m4 | 192 ++++----- bin/Makefile.in | 31 +- bin/openpam_dump_policy/Makefile.in | 50 ++- bin/pamtest/Makefile.in | 46 ++- bin/pamtest/pamtest.1 | 4 +- bin/su/Makefile.in | 46 ++- bin/su/su.1 | 4 +- compile | 13 +- config.h.in | 9 +- config.sub | 4 +- configure | 620 +++++++++++++++------------- configure.ac | 38 +- depcomp | 10 +- doc/Makefile.in | 31 +- doc/man/Makefile.in | 29 +- doc/man/openpam.3 | 2 +- doc/man/openpam_borrow_cred.3 | 2 +- doc/man/openpam_free_data.3 | 2 +- doc/man/openpam_free_envlist.3 | 2 +- doc/man/openpam_get_feature.3 | 2 +- doc/man/openpam_get_option.3 | 2 +- doc/man/openpam_log.3 | 2 +- doc/man/openpam_nullconv.3 | 2 +- doc/man/openpam_readline.3 | 2 +- doc/man/openpam_readlinev.3 | 2 +- doc/man/openpam_readword.3 | 2 +- doc/man/openpam_restore_cred.3 | 2 +- doc/man/openpam_set_feature.3 | 2 +- doc/man/openpam_set_option.3 | 2 +- doc/man/openpam_straddch.3 | 2 +- doc/man/openpam_subst.3 | 2 +- doc/man/openpam_ttyconv.3 | 2 +- doc/man/pam.3 | 2 +- doc/man/pam.conf.5 | 4 +- doc/man/pam_acct_mgmt.3 | 2 +- doc/man/pam_authenticate.3 | 2 +- doc/man/pam_chauthtok.3 | 2 +- doc/man/pam_close_session.3 | 2 +- doc/man/pam_conv.3 | 4 +- doc/man/pam_end.3 | 2 +- doc/man/pam_error.3 | 2 +- doc/man/pam_get_authtok.3 | 2 +- doc/man/pam_get_data.3 | 2 +- doc/man/pam_get_item.3 | 2 +- doc/man/pam_get_user.3 | 2 +- doc/man/pam_getenv.3 | 4 +- doc/man/pam_getenvlist.3 | 2 +- doc/man/pam_info.3 | 2 +- doc/man/pam_open_session.3 | 2 +- doc/man/pam_prompt.3 | 2 +- doc/man/pam_putenv.3 | 2 +- doc/man/pam_set_data.3 | 2 +- doc/man/pam_set_item.3 | 2 +- doc/man/pam_setcred.3 | 2 +- doc/man/pam_setenv.3 | 2 +- doc/man/pam_sm_acct_mgmt.3 | 2 +- doc/man/pam_sm_authenticate.3 | 2 +- doc/man/pam_sm_chauthtok.3 | 2 +- doc/man/pam_sm_close_session.3 | 2 +- doc/man/pam_sm_open_session.3 | 2 +- doc/man/pam_sm_setcred.3 | 2 +- doc/man/pam_start.3 | 2 +- doc/man/pam_strerror.3 | 2 +- doc/man/pam_verror.3 | 2 +- doc/man/pam_vinfo.3 | 2 +- doc/man/pam_vprompt.3 | 2 +- include/Makefile.in | 31 +- include/security/Makefile.in | 29 +- include/security/openpam_version.h | 8 +- install-sh | 4 +- lib/Makefile.in | 31 +- lib/libpam/Makefile.in | 306 ++++++++++---- lib/libpam/pam_getenv.c | 21 +- m4/ax_pkg_config.m4 | 157 +++++++ misc/Makefile.in | 29 +- missing | 16 +- modules/Makefile.in | 31 +- modules/pam_deny/Makefile.in | 71 ++-- modules/pam_permit/Makefile.in | 71 ++-- modules/pam_return/Makefile.in | 71 ++-- modules/pam_unix/Makefile.in | 74 ++-- t/Makefile.am | 11 +- t/Makefile.in | 169 +++++--- t/t_pam_env.c | 202 +++++++++ t/t_pam_err.c | 63 +++ t/t_pam_err.h | 44 ++ test-driver | 6 +- 92 files changed, 1811 insertions(+), 924 deletions(-) create mode 100644 m4/ax_pkg_config.m4 create mode 100644 t/t_pam_env.c create mode 100644 t/t_pam_err.c create mode 100644 t/t_pam_err.h diff --git a/CREDITS b/CREDITS index c294fb7cf8fc..b40c9d3b4826 100644 --- a/CREDITS +++ b/CREDITS @@ -49,5 +49,6 @@ ideas: Sebastian Krahmer Solar Designer Takanori Saneto + Tim Creech Wojciech A. Koszek Yar Tikhiy diff --git a/HISTORY b/HISTORY index bfcc4726652f..98032d7e5973 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,10 @@ +OpenPAM Tabebuia 2019-02-24 + + - BUGFIX: Fix off-by-one bug in pam_getenv(3) which was introduced in + OpenPAM Radula. + + - ENHANCE: Add unit tests for pam_{get,put,set}env(3). +============================================================================ OpenPAM Resedacea 2017-04-30 - BUGFIX: Reinstore the NULL check in pam_end(3) which was removed in @@ -5,7 +12,7 @@ OpenPAM Resedacea 2017-04-30 - BUGFIX: Return PAM_SYMBOL_ERR instead of PAM_SYSTEM_ERR from the dispatcher when the required service function could not be found. - + - ENHANCE: Introduce the PAM_BAD_HANDLE error code for when pamh is NULL in API functions that have a NULL check. diff --git a/LICENSE b/LICENSE index d8957b3cedcb..879b34bc7beb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2017 Dag-Erling Smørgrav +Copyright (c) 2004-2019 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/Makefile.in b/Makefile.in index 80b8f14d1131..05483ef6562d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ host_triplet = @host@ @WITH_DOC_TRUE@am__append_1 = doc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -140,7 +140,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -221,9 +221,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -271,6 +271,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -319,6 +322,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -367,8 +371,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -512,7 +516,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -577,7 +584,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -603,7 +610,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -621,7 +628,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -631,7 +638,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/RELNOTES b/RELNOTES index 23b159a29366..895370ae8774 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,6 +1,6 @@ - Release notes for OpenPAM Resedacea - =================================== + Release notes for OpenPAM Tabebuia + ================================== OpenPAM is developed primarily on FreeBSD, but is expected to work on almost any POSIX-like platform that has GNU autotools, GNU make and diff --git a/aclocal.m4 b/aclocal.m4 index e41b4761640e..005a0f19d170 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -346,49 +345,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -397,18 +388,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -495,8 +485,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -563,7 +553,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -605,7 +595,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +616,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -647,7 +637,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -655,49 +645,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -738,7 +721,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -765,7 +748,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -794,7 +777,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -841,7 +824,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -860,7 +843,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -941,7 +924,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1001,7 +984,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1029,7 +1012,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1048,7 +1031,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1179,6 +1162,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_pkg_config.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) diff --git a/bin/Makefile.in b/bin/Makefile.in index 24ccda7b7865..05e3166a03ee 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,10 +93,10 @@ host_triplet = @host@ @WITH_SU_TRUE@am__append_2 = su subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -138,7 +138,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -199,9 +199,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -249,6 +249,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -297,6 +300,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -329,8 +333,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -447,7 +451,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/bin/openpam_dump_policy/Makefile.in b/bin/openpam_dump_policy/Makefile.in index bf89f6e5e878..374b6242bdd4 100644 --- a/bin/openpam_dump_policy/Makefile.in +++ b/bin/openpam_dump_policy/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,10 +93,10 @@ host_triplet = @host@ noinst_PROGRAMS = openpam_dump_policy$(EXEEXT) subdir = bin/openpam_dump_policy ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -129,7 +129,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/openpam_dump_policy.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -190,9 +191,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -240,6 +241,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -288,6 +292,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -324,8 +329,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -356,7 +361,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dump_policy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dump_policy.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -437,7 +448,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -507,7 +521,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/openpam_dump_policy.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -553,7 +567,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/openpam_dump_policy.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -574,9 +588,9 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff --git a/bin/pamtest/Makefile.in b/bin/pamtest/Makefile.in index 6659af8a3ef5..090367ff62a2 100644 --- a/bin/pamtest/Makefile.in +++ b/bin/pamtest/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,10 +93,10 @@ host_triplet = @host@ bin_PROGRAMS = pamtest$(EXEEXT) subdir = bin/pamtest ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -129,7 +129,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/pamtest.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -221,9 +222,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -271,6 +272,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -319,6 +323,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -356,8 +361,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -428,7 +433,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamtest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamtest.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -550,7 +561,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -622,7 +636,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pamtest.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -668,7 +682,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pamtest.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -691,7 +705,7 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/bin/pamtest/pamtest.1 b/bin/pamtest/pamtest.1 index 0b142abe0777..aaad3e8a59bd 100644 --- a/bin/pamtest/pamtest.1 +++ b/bin/pamtest/pamtest.1 @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenPAM: pamtest.1 939 2017-04-30 21:36:50Z des $ +.\" $OpenPAM: pamtest.1 947 2019-02-24 20:18:17Z des $ .\" -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAMTEST 1 .Os .Sh NAME diff --git a/bin/su/Makefile.in b/bin/su/Makefile.in index 82e6f99bc83e..33697bcf62c1 100644 --- a/bin/su/Makefile.in +++ b/bin/su/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,10 +93,10 @@ host_triplet = @host@ bin_PROGRAMS = su$(EXEEXT) subdir = bin/su ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -129,7 +129,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/su.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -221,9 +222,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -271,6 +272,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -319,6 +323,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -356,8 +361,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -428,7 +433,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -550,7 +561,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -622,7 +636,7 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/su.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -668,7 +682,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/su.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -691,7 +705,7 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/bin/su/su.1 b/bin/su/su.1 index e6fceb061d46..7aa3a8386a53 100644 --- a/bin/su/su.1 +++ b/bin/su/su.1 @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenPAM: su.1 939 2017-04-30 21:36:50Z des $ +.\" $OpenPAM: su.1 947 2019-02-24 20:18:17Z des $ .\" -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt SU 1 .Os .Sh NAME diff --git a/compile b/compile index a85b723c7e67..99e50524b3ba 100755 --- a/compile +++ b/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/config.h.in b/config.h.in index 1c4d55e54d24..e5b659646c4f 100644 --- a/config.h.in +++ b/config.h.in @@ -6,6 +6,9 @@ /* Define to 1 if you have the `asprintf' function. */ #undef HAVE_ASPRINTF +/* Define to 1 if you have cryb-test */ +#undef HAVE_CRYB_TEST + /* Define to 1 if you have the header file. */ #undef HAVE_CRYPT_H @@ -24,12 +27,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `crypt' library (-lcrypt). */ -#undef HAVE_LIBCRYPT - -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL diff --git a/config.sub b/config.sub index a5eae2584943..3580aaf3ef9c 100644 --- a/config.sub +++ b/config.sub @@ -300,7 +300,7 @@ case $basic_machine in | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -426,7 +426,7 @@ case $basic_machine in | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | powerpcspe-* \ | pyramid-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ diff --git a/configure b/configure index 49db637d1ed7..0d39cdaafc46 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des . +# From configure.ac OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenPAM 20170430. +# Generated by GNU Autoconf 2.69 for OpenPAM 20190224. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenPAM' PACKAGE_TARNAME='openpam' -PACKAGE_VERSION='20170430' -PACKAGE_STRING='OpenPAM 20170430' +PACKAGE_VERSION='20190224' +PACKAGE_STRING='OpenPAM 20190224' PACKAGE_BUGREPORT='des@des.no' PACKAGE_URL='http://www.openpam.org/' @@ -638,10 +638,12 @@ LTLIBOBJS LIBOBJS WITH_TEST_FALSE WITH_TEST_TRUE +HAVE_CRYB_TEST_FALSE +HAVE_CRYB_TEST_TRUE +CRYB_TEST_VERSION CRYB_TEST_LIBS +CRYB_TEST_CFLAGS SYSTEM_LIBPAM -CRYPTO_LIBS -CRYPT_LIBS DL_LIBS WITH_SYSTEM_LIBPAM_FALSE WITH_SYSTEM_LIBPAM_TRUE @@ -657,6 +659,10 @@ CUSTOM_MODULES_DIR_FALSE CUSTOM_MODULES_DIR_TRUE OPENPAM_MODULES_DIR LIB_MAJ +pkgconfigdir +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG LT_SYS_LIBRARY_PATH OTOOL64 OTOOL @@ -695,7 +701,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -769,7 +774,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -783,6 +789,7 @@ with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock +with_pkgconfigdir enable_debug enable_unversioned_modules with_modules_dir @@ -804,7 +811,12 @@ LDFLAGS LIBS CPPFLAGS CPP -LT_SYS_LIBRARY_PATH' +LT_SYS_LIBRARY_PATH +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +CRYB_TEST_CFLAGS +CRYB_TEST_LIBS' # Initialize some variables set by options. @@ -1345,7 +1357,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenPAM 20170430 to adapt to many kinds of systems. +\`configure' configures OpenPAM 20190224 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1415,7 +1427,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenPAM 20170430:";; + short | recursive ) echo "Configuration of OpenPAM 20190224:";; esac cat <<\_ACEOF @@ -1454,6 +1466,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --with-pkgconfigdir installation directory for .pc files + [LIBDIR/pkgconfig] --with-modules-dir=DIR OpenPAM modules directory --without-doc do not build documentation --with-pam-unix build sample pam_unix(8) module @@ -1472,6 +1486,15 @@ Some influential environment variables: CPP C preprocessor LT_SYS_LIBRARY_PATH User-defined run-time library search path. + PKG_CONFIG path to pkg-config binary + PKG_CONFIG_PATH + list of directories to prepend to default search path + PKG_CONFIG_LIBDIR + list of directories to search instead of default search path + CRYB_TEST_CFLAGS + C compiler flags for cryb-test + CRYB_TEST_LIBS + linker flags for cryb-test Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1540,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenPAM configure 20170430 +OpenPAM configure 20190224 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1909,7 +1932,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenPAM $as_me 20170430, which was +It was created by OpenPAM $as_me 20190224, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2259,7 +2282,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.15' +am__api_version='1.16' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2774,7 +2797,7 @@ fi # Define the identity of the package. PACKAGE='openpam' - VERSION='20170430' + VERSION='20190224' cat >>confdefs.h <<_ACEOF @@ -2804,8 +2827,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -2856,7 +2879,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3728,45 +3751,45 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -12502,6 +12525,144 @@ CC=$lt_save_CC +# pkg-config + + + + + + if test x"${PKG_CONFIG}" = x"" ; then + for ac_prog in pkgconf pkg-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PKG_CONFIG" && break +done + >/dev/null + else + # Extract the first word of "${PKG_CONFIG}", so it can be a program name with args. +set dummy ${PKG_CONFIG}; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config or pkgconf" >&5 +$as_echo_n "checking for pkg-config or pkgconf... " >&6; } + if test -x "${PKG_CONFIG}" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PKG_CONFIG}" >&5 +$as_echo "${PKG_CONFIG}" >&6; } + case "${PKG_CONFIG}" in + *pkgconf) + _min_version="1.3.0" + ;; + *pkg-config) + _min_version="0.23" + ;; + *) + _min_version="9.9.error" + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking that ${PKG_CONFIG} is at least version ${_min_version}" >&5 +$as_echo_n "checking that ${PKG_CONFIG} is at least version ${_min_version}... " >&6; } + _act_version=`"${PKG_CONFIG}" --version` + if ! "${PKG_CONFIG}" --atleast-pkgconfig-version="${_min_version}" ; then + PKG_CONFIG="" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_act_version}" >&5 +$as_echo "${_act_version}" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi + if test x"${PKG_CONFIG}" = x"" ; then + as_fn_error $? "pkg-config was not found or is too old" "$LINENO" 5 + fi + +# Check whether --with-pkgconfigdir was given. +if test "${with_pkgconfigdir+set}" = set; then : + withval=$with_pkgconfigdir; pkgconfigdir=$withval +else + pkgconfigdir='${libdir}/pkgconfig' +fi + + pkgconfigdir=$pkgconfigdir + + + # other programs @@ -12766,108 +12927,6 @@ DL_LIBS="${LIBS}" LIBS="${saved_LIBS}" -saved_LIBS="${LIBS}" -LIBS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 -$as_echo_n "checking for crypt in -lcrypt... " >&6; } -if ${ac_cv_lib_crypt_crypt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char crypt (); -int -main () -{ -return crypt (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_crypt_crypt=yes -else - ac_cv_lib_crypt_crypt=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 -$as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test "x$ac_cv_lib_crypt_crypt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPT 1 -_ACEOF - - LIBS="-lcrypt $LIBS" - -fi - -CRYPT_LIBS="${LIBS}" -LIBS="${saved_LIBS}" - - -saved_LIBS="${LIBS}" -LIBS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_CTX_init in -lcrypto" >&5 -$as_echo_n "checking for HMAC_CTX_init in -lcrypto... " >&6; } -if ${ac_cv_lib_crypto_HMAC_CTX_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char HMAC_CTX_init (); -int -main () -{ -return HMAC_CTX_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_crypto_HMAC_CTX_init=yes -else - ac_cv_lib_crypto_HMAC_CTX_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_HMAC_CTX_init" >&5 -$as_echo "$ac_cv_lib_crypto_HMAC_CTX_init" >&6; } -if test "x$ac_cv_lib_crypto_HMAC_CTX_init" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 -_ACEOF - - LIBS="-lcrypto $LIBS" - -fi - -CRYPTO_LIBS="${LIBS}" -LIBS="${saved_LIBS}" - - saved_LIBS="${LIBS}" LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 @@ -12919,75 +12978,79 @@ SYSTEM_LIBPAM="${LIBS}" LIBS="${saved_LIBS}" -save_LIBS="${LIBS}" -LIBS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cryb_test_version" >&5 -$as_echo_n "checking for library containing cryb_test_version... " >&6; } -if ${ac_cv_search_cryb_test_version+:} false; then : - $as_echo_n "(cached) " >&6 + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if cryb-test is installed" >&5 +$as_echo_n "checking if cryb-test is installed... " >&6; } + if { { $as_echo "$as_me:${as_lineno-$LINENO}: \"\${PKG_CONFIG}\" --exists --print-errors \"cryb-test\""; } >&5 + ("${PKG_CONFIG}" --exists --print-errors "cryb-test") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + ax_pc_cv_have_cryb_test=yes + +$as_echo "#define HAVE_CRYB_TEST 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test version" >&5 +$as_echo_n "checking cryb-test version... " >&6; } + + + + ax_pc_cv_cryb_test_version=`"${PKG_CONFIG}" --modversion cryb-test` + + CRYB_TEST_VERSION=$ax_pc_cv_cryb_test_version + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_version:-unknown}" >&5 +$as_echo "${ax_pc_cv_cryb_test_version:-unknown}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test compiler flags" >&5 +$as_echo_n "checking cryb-test compiler flags... " >&6; } + + + + ax_pc_cv_cryb_test_cflags=`"${PKG_CONFIG}" --cflags cryb-test` + + CRYB_TEST_CFLAGS=$ax_pc_cv_cryb_test_cflags + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_cflags:-none}" >&5 +$as_echo "${ax_pc_cv_cryb_test_cflags:-none}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test linker flags" >&5 +$as_echo_n "checking cryb-test linker flags... " >&6; } + + + + ax_pc_cv_cryb_test_libs=`"${PKG_CONFIG}" --libs cryb-test` + + CRYB_TEST_LIBS=$ax_pc_cv_cryb_test_libs + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_libs:-none}" >&5 +$as_echo "${ax_pc_cv_cryb_test_libs:-none}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: Cryb test framework found, unit tests enabled." >&5 +$as_echo "$as_me: Cryb test framework found, unit tests enabled." >&6;} + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ax_pc_cv_have_cryb_test=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cryb test framework not found, unit tests disabled." >&5 +$as_echo "$as_me: WARNING: Cryb test framework not found, unit tests disabled." >&2;} + fi + + if test x"$ax_pc_cv_have_cryb_test" = x"yes"; then + HAVE_CRYB_TEST_TRUE= + HAVE_CRYB_TEST_FALSE='#' else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cryb_test_version (); -int -main () -{ -return cryb_test_version (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cryb-test; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_cryb_test_version=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_cryb_test_version+:} false; then : - break -fi -done -if ${ac_cv_search_cryb_test_version+:} false; then : - -else - ac_cv_search_cryb_test_version=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cryb_test_version" >&5 -$as_echo "$ac_cv_search_cryb_test_version" >&6; } -ac_res=$ac_cv_search_cryb_test_version -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - CRYB_TEST_LIBS="${LIBS}" - -else - - CRYB_TEST_LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cryb-test library not available, unit tests disabled" >&5 -$as_echo "$as_me: WARNING: cryb-test library not available, unit tests disabled" >&2;} - + HAVE_CRYB_TEST_TRUE='#' + HAVE_CRYB_TEST_FALSE= fi -LIBS="${save_LIBS}" - if test x"$CRYB_TEST_LIBS" != x"" ; then + + if test x"$CRYB_TEST_LIBS" != x""; then WITH_TEST_TRUE= WITH_TEST_FALSE='#' else @@ -13176,6 +13239,10 @@ if test -z "${WITH_SYSTEM_LIBPAM_TRUE}" && test -z "${WITH_SYSTEM_LIBPAM_FALSE}" as_fn_error $? "conditional \"WITH_SYSTEM_LIBPAM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_CRYB_TEST_TRUE}" && test -z "${HAVE_CRYB_TEST_FALSE}"; then + as_fn_error $? "conditional \"HAVE_CRYB_TEST\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_TEST_TRUE}" && test -z "${WITH_TEST_FALSE}"; then as_fn_error $? "conditional \"WITH_TEST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13577,7 +13644,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenPAM $as_me 20170430, which was +This file was extended by OpenPAM $as_me 20190224, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13644,7 +13711,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenPAM config.status 20170430 +OpenPAM config.status 20190224 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13763,7 +13830,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -14679,29 +14746,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14719,53 +14792,48 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)[^/].*/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) diff --git a/configure.ac b/configure.ac index 57a8b9d02aa3..6bcc55c148f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -dnl $OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $ +dnl $OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des $ AC_PREREQ([2.62]) -AC_REVISION([$OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $]) -AC_INIT([OpenPAM], [20170430], [des@des.no], [openpam], [http://www.openpam.org/]) +AC_REVISION([$OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des $]) +AC_INIT([OpenPAM], [20190224], [des@des.no], [openpam], [http://www.openpam.org/]) AC_CONFIG_SRCDIR([lib/libpam/pam_start.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) @@ -22,6 +22,9 @@ AC_C_VOLATILE LT_PREREQ([2.2.6]) LT_INIT([disable-static dlopen]) +# pkg-config +AX_PROG_PKG_CONFIG + # other programs AC_PROG_INSTALL @@ -100,20 +103,6 @@ DL_LIBS="${LIBS}" LIBS="${saved_LIBS}" AC_SUBST(DL_LIBS) -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB([crypt], [crypt]) -CRYPT_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(CRYPT_LIBS) - -saved_LIBS="${LIBS}" -LIBS="" -AC_CHECK_LIB([crypto], [HMAC_CTX_init]) -CRYPTO_LIBS="${LIBS}" -LIBS="${saved_LIBS}" -AC_SUBST(CRYPTO_LIBS) - saved_LIBS="${LIBS}" LIBS="" AC_CHECK_LIB([pam], [pam_start]) @@ -121,17 +110,10 @@ SYSTEM_LIBPAM="${LIBS}" LIBS="${saved_LIBS}" AC_SUBST(SYSTEM_LIBPAM) -save_LIBS="${LIBS}" -LIBS="" -AC_SEARCH_LIBS([cryb_test_version], [cryb-test], [ - CRYB_TEST_LIBS="${LIBS}" -], [ - CRYB_TEST_LIBS="" - AC_MSG_WARN([cryb-test library not available, unit tests disabled]) -]) -LIBS="${save_LIBS}" -AC_SUBST(CRYB_TEST_LIBS) -AM_CONDITIONAL([WITH_TEST], [ test x"$CRYB_TEST_LIBS" != x"" ]) +AX_PKG_CONFIG_CHECK([cryb-test], + [AC_MSG_NOTICE([Cryb test framework found, unit tests enabled.])], + [AC_MSG_WARN([Cryb test framework not found, unit tests disabled.])]) +AM_CONDITIONAL([WITH_TEST], [test x"$CRYB_TEST_LIBS" != x""]) AC_ARG_ENABLE([developer-warnings], AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]), diff --git a/depcomp b/depcomp index fc98710e2a1d..65cbf7093a1e 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,9 +783,9 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/doc/Makefile.in b/doc/Makefile.in index 5a310ff1d982..8086e9931380 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,10 +91,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -136,7 +136,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -197,9 +197,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -247,6 +247,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -295,6 +298,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -327,8 +331,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -445,7 +449,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in index 14c1db300436..069cb38a6a76 100644 --- a/doc/man/Makefile.in +++ b/doc/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -90,10 +90,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc/man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -170,9 +170,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -220,6 +220,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -268,6 +271,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -374,8 +378,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -481,7 +485,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/doc/man/openpam.3 b/doc/man/openpam.3 index 4c39ffe3483f..8e860aa69027 100644 --- a/doc/man/openpam.3 +++ b/doc/man/openpam.3 @@ -1,5 +1,5 @@ .\" Generated by gendoc.pl -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM 3 .Os .Sh NAME diff --git a/doc/man/openpam_borrow_cred.3 b/doc/man/openpam_borrow_cred.3 index 687ad425ed6f..f5684e596d04 100644 --- a/doc/man/openpam_borrow_cred.3 +++ b/doc/man/openpam_borrow_cred.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_borrow_cred.c by gendoc.pl .\" $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME diff --git a/doc/man/openpam_free_data.3 b/doc/man/openpam_free_data.3 index a804c2a51579..a7ec62b8c03f 100644 --- a/doc/man/openpam_free_data.3 +++ b/doc/man/openpam_free_data.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_free_data.c by gendoc.pl .\" $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME diff --git a/doc/man/openpam_free_envlist.3 b/doc/man/openpam_free_envlist.3 index d069ba00407f..30295acb5117 100644 --- a/doc/man/openpam_free_envlist.3 +++ b/doc/man/openpam_free_envlist.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_free_envlist.c by gendoc.pl .\" $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_FREE_ENVLIST 3 .Os .Sh NAME diff --git a/doc/man/openpam_get_feature.3 b/doc/man/openpam_get_feature.3 index daf49a4b63d1..f114c7edb524 100644 --- a/doc/man/openpam_get_feature.3 +++ b/doc/man/openpam_get_feature.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_get_feature.c by gendoc.pl .\" $OpenPAM: openpam_get_feature.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_GET_FEATURE 3 .Os .Sh NAME diff --git a/doc/man/openpam_get_option.3 b/doc/man/openpam_get_option.3 index bdf73db9709c..7bf718b85534 100644 --- a/doc/man/openpam_get_option.3 +++ b/doc/man/openpam_get_option.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_get_option.c by gendoc.pl .\" $OpenPAM: openpam_get_option.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME diff --git a/doc/man/openpam_log.3 b/doc/man/openpam_log.3 index a761547fc434..203b77506a9b 100644 --- a/doc/man/openpam_log.3 +++ b/doc/man/openpam_log.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_log.c by gendoc.pl .\" $OpenPAM: openpam_log.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_LOG 3 .Os .Sh NAME diff --git a/doc/man/openpam_nullconv.3 b/doc/man/openpam_nullconv.3 index 7a8139ebe0ec..3bbad28d15ae 100644 --- a/doc/man/openpam_nullconv.3 +++ b/doc/man/openpam_nullconv.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_nullconv.c by gendoc.pl .\" $OpenPAM: openpam_nullconv.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME diff --git a/doc/man/openpam_readline.3 b/doc/man/openpam_readline.3 index e33167d82e66..09164ac3c8fb 100644 --- a/doc/man/openpam_readline.3 +++ b/doc/man/openpam_readline.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_readline.c by gendoc.pl .\" $OpenPAM: openpam_readline.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_READLINE 3 .Os .Sh NAME diff --git a/doc/man/openpam_readlinev.3 b/doc/man/openpam_readlinev.3 index 6391ff50b417..351e7066d6d7 100644 --- a/doc/man/openpam_readlinev.3 +++ b/doc/man/openpam_readlinev.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_readlinev.c by gendoc.pl .\" $OpenPAM: openpam_readlinev.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_READLINEV 3 .Os .Sh NAME diff --git a/doc/man/openpam_readword.3 b/doc/man/openpam_readword.3 index e7c8b0f9224b..6393a80a21a2 100644 --- a/doc/man/openpam_readword.3 +++ b/doc/man/openpam_readword.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_readword.c by gendoc.pl .\" $OpenPAM: openpam_readword.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_READWORD 3 .Os .Sh NAME diff --git a/doc/man/openpam_restore_cred.3 b/doc/man/openpam_restore_cred.3 index 3319fd56b14b..38782738c5e3 100644 --- a/doc/man/openpam_restore_cred.3 +++ b/doc/man/openpam_restore_cred.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_restore_cred.c by gendoc.pl .\" $OpenPAM: openpam_restore_cred.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME diff --git a/doc/man/openpam_set_feature.3 b/doc/man/openpam_set_feature.3 index 30774210df06..4d05de052852 100644 --- a/doc/man/openpam_set_feature.3 +++ b/doc/man/openpam_set_feature.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_set_feature.c by gendoc.pl .\" $OpenPAM: openpam_set_feature.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_SET_FEATURE 3 .Os .Sh NAME diff --git a/doc/man/openpam_set_option.3 b/doc/man/openpam_set_option.3 index 751c3177425e..5104c13f5682 100644 --- a/doc/man/openpam_set_option.3 +++ b/doc/man/openpam_set_option.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_set_option.c by gendoc.pl .\" $OpenPAM: openpam_set_option.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME diff --git a/doc/man/openpam_straddch.3 b/doc/man/openpam_straddch.3 index 5f67891c814e..573b79e1289b 100644 --- a/doc/man/openpam_straddch.3 +++ b/doc/man/openpam_straddch.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_straddch.c by gendoc.pl .\" $OpenPAM: openpam_straddch.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_STRADDCH 3 .Os .Sh NAME diff --git a/doc/man/openpam_subst.3 b/doc/man/openpam_subst.3 index ce55577854d5..f98530a13062 100644 --- a/doc/man/openpam_subst.3 +++ b/doc/man/openpam_subst.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_subst.c by gendoc.pl .\" $OpenPAM: openpam_subst.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_SUBST 3 .Os .Sh NAME diff --git a/doc/man/openpam_ttyconv.3 b/doc/man/openpam_ttyconv.3 index 4be2cd698dff..144026ba5ad4 100644 --- a/doc/man/openpam_ttyconv.3 +++ b/doc/man/openpam_ttyconv.3 @@ -1,6 +1,6 @@ .\" Generated from openpam_ttyconv.c by gendoc.pl .\" $OpenPAM: openpam_ttyconv.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME diff --git a/doc/man/pam.3 b/doc/man/pam.3 index 7707e5dbf7af..64b7c17abda1 100644 --- a/doc/man/pam.3 +++ b/doc/man/pam.3 @@ -1,5 +1,5 @@ .\" Generated by gendoc.pl -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM 3 .Os .Sh NAME diff --git a/doc/man/pam.conf.5 b/doc/man/pam.conf.5 index 777e839ea2ca..39f16782067d 100644 --- a/doc/man/pam.conf.5 +++ b/doc/man/pam.conf.5 @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenPAM: pam.conf.5 939 2017-04-30 21:36:50Z des $ +.\" $OpenPAM: pam.conf.5 947 2019-02-24 20:18:17Z des $ .\" -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM.CONF 5 .Os .Sh NAME diff --git a/doc/man/pam_acct_mgmt.3 b/doc/man/pam_acct_mgmt.3 index bd32933f3721..ce4a276fcab5 100644 --- a/doc/man/pam_acct_mgmt.3 +++ b/doc/man/pam_acct_mgmt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_acct_mgmt.c by gendoc.pl .\" $OpenPAM: pam_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME diff --git a/doc/man/pam_authenticate.3 b/doc/man/pam_authenticate.3 index 2701172abe58..2c6b908d83bb 100644 --- a/doc/man/pam_authenticate.3 +++ b/doc/man/pam_authenticate.3 @@ -1,6 +1,6 @@ .\" Generated from pam_authenticate.c by gendoc.pl .\" $OpenPAM: pam_authenticate.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME diff --git a/doc/man/pam_chauthtok.3 b/doc/man/pam_chauthtok.3 index 89b7416db8dc..3bd0fc8c9619 100644 --- a/doc/man/pam_chauthtok.3 +++ b/doc/man/pam_chauthtok.3 @@ -1,6 +1,6 @@ .\" Generated from pam_chauthtok.c by gendoc.pl .\" $OpenPAM: pam_chauthtok.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME diff --git a/doc/man/pam_close_session.3 b/doc/man/pam_close_session.3 index 749d2199f21c..70e5c5bcace0 100644 --- a/doc/man/pam_close_session.3 +++ b/doc/man/pam_close_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_close_session.c by gendoc.pl .\" $OpenPAM: pam_close_session.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME diff --git a/doc/man/pam_conv.3 b/doc/man/pam_conv.3 index bbf0a572cbe7..f596f2638839 100644 --- a/doc/man/pam_conv.3 +++ b/doc/man/pam_conv.3 @@ -32,9 +32,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenPAM: pam_conv.3 939 2017-04-30 21:36:50Z des $ +.\" $OpenPAM: pam_conv.3 947 2019-02-24 20:18:17Z des $ .\" -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_CONV 3 .Os .Sh NAME diff --git a/doc/man/pam_end.3 b/doc/man/pam_end.3 index af4cbecffe62..ff9542dcfd86 100644 --- a/doc/man/pam_end.3 +++ b/doc/man/pam_end.3 @@ -1,6 +1,6 @@ .\" Generated from pam_end.c by gendoc.pl .\" $OpenPAM: pam_end.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_END 3 .Os .Sh NAME diff --git a/doc/man/pam_error.3 b/doc/man/pam_error.3 index cf3445ea906a..484dbab9bc12 100644 --- a/doc/man/pam_error.3 +++ b/doc/man/pam_error.3 @@ -1,6 +1,6 @@ .\" Generated from pam_error.c by gendoc.pl .\" $OpenPAM: pam_error.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_ERROR 3 .Os .Sh NAME diff --git a/doc/man/pam_get_authtok.3 b/doc/man/pam_get_authtok.3 index bedeffbe033c..08b20fbd55ae 100644 --- a/doc/man/pam_get_authtok.3 +++ b/doc/man/pam_get_authtok.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_authtok.c by gendoc.pl .\" $OpenPAM: pam_get_authtok.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME diff --git a/doc/man/pam_get_data.3 b/doc/man/pam_get_data.3 index 104e25aeca96..e838be24eae9 100644 --- a/doc/man/pam_get_data.3 +++ b/doc/man/pam_get_data.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_data.c by gendoc.pl .\" $OpenPAM: pam_get_data.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_GET_DATA 3 .Os .Sh NAME diff --git a/doc/man/pam_get_item.3 b/doc/man/pam_get_item.3 index 9f96e96b6407..278bb2f4d8c2 100644 --- a/doc/man/pam_get_item.3 +++ b/doc/man/pam_get_item.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_item.c by gendoc.pl .\" $OpenPAM: pam_get_item.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_GET_ITEM 3 .Os .Sh NAME diff --git a/doc/man/pam_get_user.3 b/doc/man/pam_get_user.3 index 58a861d48075..2c21dd744023 100644 --- a/doc/man/pam_get_user.3 +++ b/doc/man/pam_get_user.3 @@ -1,6 +1,6 @@ .\" Generated from pam_get_user.c by gendoc.pl .\" $OpenPAM: pam_get_user.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_GET_USER 3 .Os .Sh NAME diff --git a/doc/man/pam_getenv.3 b/doc/man/pam_getenv.3 index dbbb484896f4..aa830488cff3 100644 --- a/doc/man/pam_getenv.3 +++ b/doc/man/pam_getenv.3 @@ -1,6 +1,6 @@ .\" Generated from pam_getenv.c by gendoc.pl -.\" $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.\" $OpenPAM: pam_getenv.c 944 2019-02-22 09:49:12Z des $ +.Dd February 24, 2019 .Dt PAM_GETENV 3 .Os .Sh NAME diff --git a/doc/man/pam_getenvlist.3 b/doc/man/pam_getenvlist.3 index 29827cd53a32..e6bad00a1ccb 100644 --- a/doc/man/pam_getenvlist.3 +++ b/doc/man/pam_getenvlist.3 @@ -1,6 +1,6 @@ .\" Generated from pam_getenvlist.c by gendoc.pl .\" $OpenPAM: pam_getenvlist.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_GETENVLIST 3 .Os .Sh NAME diff --git a/doc/man/pam_info.3 b/doc/man/pam_info.3 index 5fd8d5f57195..4104cb86b858 100644 --- a/doc/man/pam_info.3 +++ b/doc/man/pam_info.3 @@ -1,6 +1,6 @@ .\" Generated from pam_info.c by gendoc.pl .\" $OpenPAM: pam_info.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_INFO 3 .Os .Sh NAME diff --git a/doc/man/pam_open_session.3 b/doc/man/pam_open_session.3 index dd026071edac..46f6b5ed8141 100644 --- a/doc/man/pam_open_session.3 +++ b/doc/man/pam_open_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_open_session.c by gendoc.pl .\" $OpenPAM: pam_open_session.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME diff --git a/doc/man/pam_prompt.3 b/doc/man/pam_prompt.3 index b78ce3a41b41..1c26ea930f33 100644 --- a/doc/man/pam_prompt.3 +++ b/doc/man/pam_prompt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_prompt.c by gendoc.pl .\" $OpenPAM: pam_prompt.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_PROMPT 3 .Os .Sh NAME diff --git a/doc/man/pam_putenv.3 b/doc/man/pam_putenv.3 index 2be772ffec3f..cd92e2665429 100644 --- a/doc/man/pam_putenv.3 +++ b/doc/man/pam_putenv.3 @@ -1,6 +1,6 @@ .\" Generated from pam_putenv.c by gendoc.pl .\" $OpenPAM: pam_putenv.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_PUTENV 3 .Os .Sh NAME diff --git a/doc/man/pam_set_data.3 b/doc/man/pam_set_data.3 index 253d014877fc..51eeaaf8288a 100644 --- a/doc/man/pam_set_data.3 +++ b/doc/man/pam_set_data.3 @@ -1,6 +1,6 @@ .\" Generated from pam_set_data.c by gendoc.pl .\" $OpenPAM: pam_set_data.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SET_DATA 3 .Os .Sh NAME diff --git a/doc/man/pam_set_item.3 b/doc/man/pam_set_item.3 index 3d479c92dd1d..7538a27542e4 100644 --- a/doc/man/pam_set_item.3 +++ b/doc/man/pam_set_item.3 @@ -1,6 +1,6 @@ .\" Generated from pam_set_item.c by gendoc.pl .\" $OpenPAM: pam_set_item.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SET_ITEM 3 .Os .Sh NAME diff --git a/doc/man/pam_setcred.3 b/doc/man/pam_setcred.3 index fc5eaadc2b0c..166becc688d1 100644 --- a/doc/man/pam_setcred.3 +++ b/doc/man/pam_setcred.3 @@ -1,6 +1,6 @@ .\" Generated from pam_setcred.c by gendoc.pl .\" $OpenPAM: pam_setcred.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SETCRED 3 .Os .Sh NAME diff --git a/doc/man/pam_setenv.3 b/doc/man/pam_setenv.3 index 8fced1e8cc5e..783a2eb38a4e 100644 --- a/doc/man/pam_setenv.3 +++ b/doc/man/pam_setenv.3 @@ -1,6 +1,6 @@ .\" Generated from pam_setenv.c by gendoc.pl .\" $OpenPAM: pam_setenv.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SETENV 3 .Os .Sh NAME diff --git a/doc/man/pam_sm_acct_mgmt.3 b/doc/man/pam_sm_acct_mgmt.3 index 2df56b5aa29a..73e91aecd973 100644 --- a/doc/man/pam_sm_acct_mgmt.3 +++ b/doc/man/pam_sm_acct_mgmt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_acct_mgmt.c by gendoc.pl .\" $OpenPAM: pam_sm_acct_mgmt.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME diff --git a/doc/man/pam_sm_authenticate.3 b/doc/man/pam_sm_authenticate.3 index 1dc6c69ca9b5..33da29207a54 100644 --- a/doc/man/pam_sm_authenticate.3 +++ b/doc/man/pam_sm_authenticate.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_authenticate.c by gendoc.pl .\" $OpenPAM: pam_sm_authenticate.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME diff --git a/doc/man/pam_sm_chauthtok.3 b/doc/man/pam_sm_chauthtok.3 index be1baa8d5791..2483eab76aa7 100644 --- a/doc/man/pam_sm_chauthtok.3 +++ b/doc/man/pam_sm_chauthtok.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_chauthtok.c by gendoc.pl .\" $OpenPAM: pam_sm_chauthtok.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME diff --git a/doc/man/pam_sm_close_session.3 b/doc/man/pam_sm_close_session.3 index 5b2034e15c7e..501f7c634e83 100644 --- a/doc/man/pam_sm_close_session.3 +++ b/doc/man/pam_sm_close_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_close_session.c by gendoc.pl .\" $OpenPAM: pam_sm_close_session.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME diff --git a/doc/man/pam_sm_open_session.3 b/doc/man/pam_sm_open_session.3 index 6b4ab9a409b3..76f2a0b23142 100644 --- a/doc/man/pam_sm_open_session.3 +++ b/doc/man/pam_sm_open_session.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_open_session.c by gendoc.pl .\" $OpenPAM: pam_sm_open_session.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME diff --git a/doc/man/pam_sm_setcred.3 b/doc/man/pam_sm_setcred.3 index cf1b76eb043b..9cc8cd55774b 100644 --- a/doc/man/pam_sm_setcred.3 +++ b/doc/man/pam_sm_setcred.3 @@ -1,6 +1,6 @@ .\" Generated from pam_sm_setcred.c by gendoc.pl .\" $OpenPAM: pam_sm_setcred.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME diff --git a/doc/man/pam_start.3 b/doc/man/pam_start.3 index 7a2ba5bb8f2a..a280ebabaef9 100644 --- a/doc/man/pam_start.3 +++ b/doc/man/pam_start.3 @@ -1,6 +1,6 @@ .\" Generated from pam_start.c by gendoc.pl .\" $OpenPAM: pam_start.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_START 3 .Os .Sh NAME diff --git a/doc/man/pam_strerror.3 b/doc/man/pam_strerror.3 index bdfb1c2649c4..50b2550e8b60 100644 --- a/doc/man/pam_strerror.3 +++ b/doc/man/pam_strerror.3 @@ -1,6 +1,6 @@ .\" Generated from pam_strerror.c by gendoc.pl .\" $OpenPAM: pam_strerror.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_STRERROR 3 .Os .Sh NAME diff --git a/doc/man/pam_verror.3 b/doc/man/pam_verror.3 index ed680b72ad6b..e78ea070a30a 100644 --- a/doc/man/pam_verror.3 +++ b/doc/man/pam_verror.3 @@ -1,6 +1,6 @@ .\" Generated from pam_verror.c by gendoc.pl .\" $OpenPAM: pam_verror.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_VERROR 3 .Os .Sh NAME diff --git a/doc/man/pam_vinfo.3 b/doc/man/pam_vinfo.3 index a5923cb8573c..da73f34ccf1c 100644 --- a/doc/man/pam_vinfo.3 +++ b/doc/man/pam_vinfo.3 @@ -1,6 +1,6 @@ .\" Generated from pam_vinfo.c by gendoc.pl .\" $OpenPAM: pam_vinfo.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_VINFO 3 .Os .Sh NAME diff --git a/doc/man/pam_vprompt.3 b/doc/man/pam_vprompt.3 index 4cfa9ed77dd1..ff21c261f044 100644 --- a/doc/man/pam_vprompt.3 +++ b/doc/man/pam_vprompt.3 @@ -1,6 +1,6 @@ .\" Generated from pam_vprompt.c by gendoc.pl .\" $OpenPAM: pam_vprompt.c 938 2017-04-30 21:34:42Z des $ -.Dd April 30, 2017 +.Dd February 24, 2019 .Dt PAM_VPROMPT 3 .Os .Sh NAME diff --git a/include/Makefile.in b/include/Makefile.in index 3777407c6157..5efd8ffdfa58 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,10 +91,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -136,7 +136,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -197,9 +197,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -247,6 +247,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -295,6 +298,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -327,8 +331,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -445,7 +449,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/include/security/Makefile.in b/include/security/Makefile.in index 8c1405037989..9652e0c318b1 100644 --- a/include/security/Makefile.in +++ b/include/security/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = include/security ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(security_HEADERS) \ @@ -186,9 +186,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -236,6 +236,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -284,6 +287,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -325,8 +329,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -417,7 +421,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h index 9a2e1cb17a6e..21a4ba9a0228 100644 --- a/include/security/openpam_version.h +++ b/include/security/openpam_version.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2017 Dag-Erling Smørgrav + * Copyright (c) 2004-2019 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,14 +32,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenPAM: openpam_version.h 938 2017-04-30 21:34:42Z des $ + * $OpenPAM: openpam_version.h 945 2019-02-22 09:52:46Z des $ */ #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED #define SECURITY_OPENPAM_VERSION_H_INCLUDED #define OPENPAM -#define OPENPAM_VERSION 20170430 -#define OPENPAM_RELEASE "Resedacea" +#define OPENPAM_VERSION 20190224 +#define OPENPAM_RELEASE "Tabebuia" #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ diff --git a/install-sh b/install-sh index 0b0fdcbba69a..0360b79e7d02 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2013-12-25.23; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -496,6 +496,6 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/lib/Makefile.in b/lib/Makefile.in index ed2ff0f44813..1ff96b17ad48 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ host_triplet = @host@ @WITH_SYSTEM_LIBPAM_FALSE@am__append_1 = libpam subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -137,7 +137,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -198,9 +198,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -248,6 +248,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -296,6 +299,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -328,8 +332,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -446,7 +450,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/lib/libpam/Makefile.in b/lib/libpam/Makefile.in index c6e4b44f55c2..1165a32f134d 100644 --- a/lib/libpam/Makefile.in +++ b/lib/libpam/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -93,10 +93,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/libpam ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ @@ -178,7 +178,48 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/openpam_asprintf.Plo \ + ./$(DEPDIR)/openpam_borrow_cred.Plo \ + ./$(DEPDIR)/openpam_check_owner_perms.Plo \ + ./$(DEPDIR)/openpam_configure.Plo \ + ./$(DEPDIR)/openpam_constants.Plo \ + ./$(DEPDIR)/openpam_dispatch.Plo \ + ./$(DEPDIR)/openpam_dynamic.Plo \ + ./$(DEPDIR)/openpam_features.Plo \ + ./$(DEPDIR)/openpam_findenv.Plo \ + ./$(DEPDIR)/openpam_free_data.Plo \ + ./$(DEPDIR)/openpam_free_envlist.Plo \ + ./$(DEPDIR)/openpam_get_feature.Plo \ + ./$(DEPDIR)/openpam_get_option.Plo \ + ./$(DEPDIR)/openpam_load.Plo ./$(DEPDIR)/openpam_log.Plo \ + ./$(DEPDIR)/openpam_nullconv.Plo \ + ./$(DEPDIR)/openpam_readline.Plo \ + ./$(DEPDIR)/openpam_readlinev.Plo \ + ./$(DEPDIR)/openpam_readword.Plo \ + ./$(DEPDIR)/openpam_restore_cred.Plo \ + ./$(DEPDIR)/openpam_set_feature.Plo \ + ./$(DEPDIR)/openpam_set_option.Plo \ + ./$(DEPDIR)/openpam_static.Plo \ + ./$(DEPDIR)/openpam_straddch.Plo \ + ./$(DEPDIR)/openpam_strlcat.Plo \ + ./$(DEPDIR)/openpam_strlcpy.Plo \ + ./$(DEPDIR)/openpam_strlset.Plo ./$(DEPDIR)/openpam_subst.Plo \ + ./$(DEPDIR)/openpam_ttyconv.Plo \ + ./$(DEPDIR)/openpam_vasprintf.Plo \ + ./$(DEPDIR)/pam_acct_mgmt.Plo ./$(DEPDIR)/pam_authenticate.Plo \ + ./$(DEPDIR)/pam_chauthtok.Plo \ + ./$(DEPDIR)/pam_close_session.Plo ./$(DEPDIR)/pam_end.Plo \ + ./$(DEPDIR)/pam_error.Plo ./$(DEPDIR)/pam_get_authtok.Plo \ + ./$(DEPDIR)/pam_get_data.Plo ./$(DEPDIR)/pam_get_item.Plo \ + ./$(DEPDIR)/pam_get_user.Plo ./$(DEPDIR)/pam_getenv.Plo \ + ./$(DEPDIR)/pam_getenvlist.Plo ./$(DEPDIR)/pam_info.Plo \ + ./$(DEPDIR)/pam_open_session.Plo ./$(DEPDIR)/pam_prompt.Plo \ + ./$(DEPDIR)/pam_putenv.Plo ./$(DEPDIR)/pam_set_data.Plo \ + ./$(DEPDIR)/pam_set_item.Plo ./$(DEPDIR)/pam_setcred.Plo \ + ./$(DEPDIR)/pam_setenv.Plo ./$(DEPDIR)/pam_start.Plo \ + ./$(DEPDIR)/pam_strerror.Plo ./$(DEPDIR)/pam_verror.Plo \ + ./$(DEPDIR)/pam_vinfo.Plo ./$(DEPDIR)/pam_vprompt.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -240,9 +281,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -290,6 +331,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -338,6 +382,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -467,8 +512,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -524,61 +569,67 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_asprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_borrow_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_check_owner_perms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_configure.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_constants.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dispatch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dynamic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_features.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_findenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_envlist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_feature.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_load.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_log.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_nullconv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readline.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readlinev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readword.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_restore_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_feature.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_static.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_acct_mgmt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_authenticate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_chauthtok.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_close_session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_end.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_authtok.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_item.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_user.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenvlist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_info.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_open_session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prompt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_putenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_item.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setcred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_start.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_strerror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_verror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vinfo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_asprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_borrow_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_check_owner_perms.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_configure.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_constants.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dispatch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dynamic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_features.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_findenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_data.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_envlist.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_feature.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_option.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_load.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_log.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_nullconv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readline.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readlinev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readword.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_restore_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_feature.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_option.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_static.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_acct_mgmt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_authenticate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_chauthtok.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_close_session.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_end.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_authtok.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_data.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_item.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_user.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenvlist.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_info.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_open_session.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prompt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_putenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_data.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_item.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setcred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_start.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_strerror.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_verror.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -659,7 +710,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -732,7 +786,61 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/openpam_asprintf.Plo + -rm -f ./$(DEPDIR)/openpam_borrow_cred.Plo + -rm -f ./$(DEPDIR)/openpam_check_owner_perms.Plo + -rm -f ./$(DEPDIR)/openpam_configure.Plo + -rm -f ./$(DEPDIR)/openpam_constants.Plo + -rm -f ./$(DEPDIR)/openpam_dispatch.Plo + -rm -f ./$(DEPDIR)/openpam_dynamic.Plo + -rm -f ./$(DEPDIR)/openpam_features.Plo + -rm -f ./$(DEPDIR)/openpam_findenv.Plo + -rm -f ./$(DEPDIR)/openpam_free_data.Plo + -rm -f ./$(DEPDIR)/openpam_free_envlist.Plo + -rm -f ./$(DEPDIR)/openpam_get_feature.Plo + -rm -f ./$(DEPDIR)/openpam_get_option.Plo + -rm -f ./$(DEPDIR)/openpam_load.Plo + -rm -f ./$(DEPDIR)/openpam_log.Plo + -rm -f ./$(DEPDIR)/openpam_nullconv.Plo + -rm -f ./$(DEPDIR)/openpam_readline.Plo + -rm -f ./$(DEPDIR)/openpam_readlinev.Plo + -rm -f ./$(DEPDIR)/openpam_readword.Plo + -rm -f ./$(DEPDIR)/openpam_restore_cred.Plo + -rm -f ./$(DEPDIR)/openpam_set_feature.Plo + -rm -f ./$(DEPDIR)/openpam_set_option.Plo + -rm -f ./$(DEPDIR)/openpam_static.Plo + -rm -f ./$(DEPDIR)/openpam_straddch.Plo + -rm -f ./$(DEPDIR)/openpam_strlcat.Plo + -rm -f ./$(DEPDIR)/openpam_strlcpy.Plo + -rm -f ./$(DEPDIR)/openpam_strlset.Plo + -rm -f ./$(DEPDIR)/openpam_subst.Plo + -rm -f ./$(DEPDIR)/openpam_ttyconv.Plo + -rm -f ./$(DEPDIR)/openpam_vasprintf.Plo + -rm -f ./$(DEPDIR)/pam_acct_mgmt.Plo + -rm -f ./$(DEPDIR)/pam_authenticate.Plo + -rm -f ./$(DEPDIR)/pam_chauthtok.Plo + -rm -f ./$(DEPDIR)/pam_close_session.Plo + -rm -f ./$(DEPDIR)/pam_end.Plo + -rm -f ./$(DEPDIR)/pam_error.Plo + -rm -f ./$(DEPDIR)/pam_get_authtok.Plo + -rm -f ./$(DEPDIR)/pam_get_data.Plo + -rm -f ./$(DEPDIR)/pam_get_item.Plo + -rm -f ./$(DEPDIR)/pam_get_user.Plo + -rm -f ./$(DEPDIR)/pam_getenv.Plo + -rm -f ./$(DEPDIR)/pam_getenvlist.Plo + -rm -f ./$(DEPDIR)/pam_info.Plo + -rm -f ./$(DEPDIR)/pam_open_session.Plo + -rm -f ./$(DEPDIR)/pam_prompt.Plo + -rm -f ./$(DEPDIR)/pam_putenv.Plo + -rm -f ./$(DEPDIR)/pam_set_data.Plo + -rm -f ./$(DEPDIR)/pam_set_item.Plo + -rm -f ./$(DEPDIR)/pam_setcred.Plo + -rm -f ./$(DEPDIR)/pam_setenv.Plo + -rm -f ./$(DEPDIR)/pam_start.Plo + -rm -f ./$(DEPDIR)/pam_strerror.Plo + -rm -f ./$(DEPDIR)/pam_verror.Plo + -rm -f ./$(DEPDIR)/pam_vinfo.Plo + -rm -f ./$(DEPDIR)/pam_vprompt.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -778,7 +886,61 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/openpam_asprintf.Plo + -rm -f ./$(DEPDIR)/openpam_borrow_cred.Plo + -rm -f ./$(DEPDIR)/openpam_check_owner_perms.Plo + -rm -f ./$(DEPDIR)/openpam_configure.Plo + -rm -f ./$(DEPDIR)/openpam_constants.Plo + -rm -f ./$(DEPDIR)/openpam_dispatch.Plo + -rm -f ./$(DEPDIR)/openpam_dynamic.Plo + -rm -f ./$(DEPDIR)/openpam_features.Plo + -rm -f ./$(DEPDIR)/openpam_findenv.Plo + -rm -f ./$(DEPDIR)/openpam_free_data.Plo + -rm -f ./$(DEPDIR)/openpam_free_envlist.Plo + -rm -f ./$(DEPDIR)/openpam_get_feature.Plo + -rm -f ./$(DEPDIR)/openpam_get_option.Plo + -rm -f ./$(DEPDIR)/openpam_load.Plo + -rm -f ./$(DEPDIR)/openpam_log.Plo + -rm -f ./$(DEPDIR)/openpam_nullconv.Plo + -rm -f ./$(DEPDIR)/openpam_readline.Plo + -rm -f ./$(DEPDIR)/openpam_readlinev.Plo + -rm -f ./$(DEPDIR)/openpam_readword.Plo + -rm -f ./$(DEPDIR)/openpam_restore_cred.Plo + -rm -f ./$(DEPDIR)/openpam_set_feature.Plo + -rm -f ./$(DEPDIR)/openpam_set_option.Plo + -rm -f ./$(DEPDIR)/openpam_static.Plo + -rm -f ./$(DEPDIR)/openpam_straddch.Plo + -rm -f ./$(DEPDIR)/openpam_strlcat.Plo + -rm -f ./$(DEPDIR)/openpam_strlcpy.Plo + -rm -f ./$(DEPDIR)/openpam_strlset.Plo + -rm -f ./$(DEPDIR)/openpam_subst.Plo + -rm -f ./$(DEPDIR)/openpam_ttyconv.Plo + -rm -f ./$(DEPDIR)/openpam_vasprintf.Plo + -rm -f ./$(DEPDIR)/pam_acct_mgmt.Plo + -rm -f ./$(DEPDIR)/pam_authenticate.Plo + -rm -f ./$(DEPDIR)/pam_chauthtok.Plo + -rm -f ./$(DEPDIR)/pam_close_session.Plo + -rm -f ./$(DEPDIR)/pam_end.Plo + -rm -f ./$(DEPDIR)/pam_error.Plo + -rm -f ./$(DEPDIR)/pam_get_authtok.Plo + -rm -f ./$(DEPDIR)/pam_get_data.Plo + -rm -f ./$(DEPDIR)/pam_get_item.Plo + -rm -f ./$(DEPDIR)/pam_get_user.Plo + -rm -f ./$(DEPDIR)/pam_getenv.Plo + -rm -f ./$(DEPDIR)/pam_getenvlist.Plo + -rm -f ./$(DEPDIR)/pam_info.Plo + -rm -f ./$(DEPDIR)/pam_open_session.Plo + -rm -f ./$(DEPDIR)/pam_prompt.Plo + -rm -f ./$(DEPDIR)/pam_putenv.Plo + -rm -f ./$(DEPDIR)/pam_set_data.Plo + -rm -f ./$(DEPDIR)/pam_set_item.Plo + -rm -f ./$(DEPDIR)/pam_setcred.Plo + -rm -f ./$(DEPDIR)/pam_setenv.Plo + -rm -f ./$(DEPDIR)/pam_start.Plo + -rm -f ./$(DEPDIR)/pam_strerror.Plo + -rm -f ./$(DEPDIR)/pam_verror.Plo + -rm -f ./$(DEPDIR)/pam_vinfo.Plo + -rm -f ./$(DEPDIR)/pam_vprompt.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -799,9 +961,9 @@ uninstall-am: uninstall-libLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff --git a/lib/libpam/pam_getenv.c b/lib/libpam/pam_getenv.c index c3bbcd8eac2f..c207f5cfe470 100644 --- a/lib/libpam/pam_getenv.c +++ b/lib/libpam/pam_getenv.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2017 Dag-Erling Smørgrav + * Copyright (c) 2004-2019 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $ + * $OpenPAM: pam_getenv.c 944 2019-02-22 09:49:12Z des $ */ #ifdef HAVE_CONFIG_H @@ -58,19 +58,20 @@ const char * pam_getenv(pam_handle_t *pamh, const char *name) { - char *str; + size_t len; int i; ENTERS(name); - if (strchr(name, '=') != NULL) { - errno = EINVAL; - RETURNS(NULL); + for (len = 0; name[len] != '\0'; ++len) { + if (name[len] == '=') { + errno = EINVAL; + RETURNS(NULL); + } } - if ((i = openpam_findenv(pamh, name, strlen(name))) < 0) + if ((i = openpam_findenv(pamh, name, len)) < 0) RETURNS(NULL); - if ((str = strchr(pamh->env[i], '=')) == NULL) - RETURNS(""); - RETURNS(str); + /* assert(pamh->env[i][len] == '='); */ + RETURNS(pamh->env[i] + len + 1); } /** diff --git a/m4/ax_pkg_config.m4 b/m4/ax_pkg_config.m4 new file mode 100644 index 000000000000..a888c656e115 --- /dev/null +++ b/m4/ax_pkg_config.m4 @@ -0,0 +1,157 @@ +dnl -*- autoconf -*- +dnl +dnl Copyright (c) 2017 The University of Oslo +dnl All rights reserved. +dnl +dnl Redistribution and use in source and binary forms, with or without +dnl modification, are permitted provided that the following conditions +dnl are met: +dnl 1. Redistributions of source code must retain the above copyright +dnl notice, this list of conditions and the following disclaimer. +dnl 2. Redistributions in binary form must reproduce the above copyright +dnl notice, this list of conditions and the following disclaimer in the +dnl documentation and/or other materials provided with the distribution. +dnl 3. The name of the author may not be used to endorse or promote +dnl products derived from this software without specific prior written +dnl permission. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +dnl ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +dnl ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +dnl FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +dnl LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +dnl OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +dnl SUCH DAMAGE. +dnl + +m4_define([AX_PKG_CONFIG_MACROS_VERSION], [0.20170404]) + +dnl +dnl AX_PROG_PKG_CONFIG([min-version]) +dnl --------------------------------- +dnl +dnl Verify that pkgconf or pkg-config are present. +dnl +AC_DEFUN([AX_PROG_PKG_CONFIG], [ + m4_pattern_forbid([^AX_PKG_CONFIG_[A-Z_]+$]) + AC_ARG_VAR([PKG_CONFIG], [path to pkg-config binary]) + AC_ARG_VAR([PKG_CONFIG_PATH], [list of directories to prepend to default search path]) + AC_ARG_VAR([PKG_CONFIG_LIBDIR], [list of directories to search instead of default search path]) + if test x"${PKG_CONFIG}" = x"" ; then + AC_PATH_PROGS([PKG_CONFIG], [pkgconf pkg-config]) >/dev/null + else + AC_PATH_PROG([PKG_CONFIG], [${PKG_CONFIG}]) + fi + AC_MSG_CHECKING([for pkg-config or pkgconf]) + if test -x "${PKG_CONFIG}" ; then + AC_MSG_RESULT([${PKG_CONFIG}]) + case "${PKG_CONFIG}" in + *pkgconf) + _min_version="m4_default([$1], [1.3.0])" + ;; + *pkg-config) + _min_version="m4_default([$1], [0.23])" + ;; + *) + _min_version="9.9.error" + ;; + esac + AC_MSG_CHECKING([that ${PKG_CONFIG} is at least version ${_min_version}]) + _act_version=`"${PKG_CONFIG}" --version` + if ! "${PKG_CONFIG}" --atleast-pkgconfig-version="${_min_version}" ; then + PKG_CONFIG="" + fi + AC_MSG_RESULT([${_act_version}]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + if test x"${PKG_CONFIG}" = x"" ; then + AC_MSG_ERROR([pkg-config was not found or is too old]) + fi + AC_ARG_WITH([pkgconfigdir], + AS_HELP_STRING([--with-pkgconfigdir], + [installation directory for .pc files @<:@LIBDIR/pkgconfig@:>@]), + [pkgconfigdir=$withval], [pkgconfigdir='${libdir}/pkgconfig']) + AC_SUBST([pkgconfigdir], [$pkgconfigdir]) +]) + +dnl +dnl AX_PKG_CONFIG_VAR(package-name, var-name) +dnl ----------------------------------------- +dnl +dnl Retrieve specific pkg-config variables for the specified package. +dnl +AC_DEFUN([AX_PKG_CONFIG_VAR], [ + AC_REQUIRE([AX_PROG_PKG_CONFIG]) + m4_define([_p], AS_TR_SH([m4_tolower([$1])])) + m4_case([$2], + [version], [ax_pc_cv_[]_p[]_version=`"${PKG_CONFIG}" --modversion [$1]`], + [cflags], [ax_pc_cv_[]_p[]_cflags=`"${PKG_CONFIG}" --cflags [$1]`], + [libs], [ax_pc_cv_[]_p[]_libs=`"${PKG_CONFIG}" --libs [$1]`], + [ax_pc_cv_[]_p[]_[$2]=`"${PKG_CONFIG}" --variable=[$2] [$1]`]) +]) + +dnl +dnl AX_PKG_CONFIG_CHECK(package-name, +dnl [action-if-found], [action-if-not-found]) +dnl ------------------------------------------- +dnl +dnl Check if the specified package is installed. If it is, define +dnl HAVE_PACKAGE, PACKAGE_VERSION, PACKAGE_CFLAGS and PACKAGE_LIBS. +dnl The specified actions are performed in addition to the standard +dnl actions. +dnl +AC_DEFUN([AX_PKG_CONFIG_CHECK], [ + AC_REQUIRE([AX_PROG_PKG_CONFIG]) + m4_define([_P], AS_TR_SH([m4_toupper([$1])])) + m4_define([_p], AS_TR_SH([m4_tolower([$1])])) + AC_ARG_VAR(_P[_CFLAGS], [C compiler flags for $1]) + AC_ARG_VAR(_P[_LIBS], [linker flags for $1]) + AC_MSG_CHECKING([if $1 is installed]) + if AC_RUN_LOG(["${PKG_CONFIG}" --exists --print-errors "$1"]) ; then + AC_MSG_RESULT([yes]) + [ax_pc_cv_have_]_p=yes + AC_DEFINE([HAVE_]_P, [1], [Define to 1 if you have $1]) +dnl + AC_MSG_CHECKING([$1 version]) + AX_PKG_CONFIG_VAR([$1], [version]) + AC_SUBST(_P[_VERSION], [$ax_pc_cv_]_p[_version]) + AC_MSG_RESULT([${ax_pc_cv_]_p[_version:-unknown}]) +dnl + AC_MSG_CHECKING([$1 compiler flags]) + AX_PKG_CONFIG_VAR([$1], [cflags]) + AC_SUBST(_P[_CFLAGS], [$ax_pc_cv_]_p[_cflags]) + AC_MSG_RESULT([${ax_pc_cv_]_p[_cflags:-none}]) +dnl + AC_MSG_CHECKING([$1 linker flags]) + AX_PKG_CONFIG_VAR([$1], [libs]) + AC_SUBST(_P[_LIBS], [$ax_pc_cv_]_p[_libs]) + AC_MSG_RESULT([${ax_pc_cv_]_p[_libs:-none}]) +dnl + m4_default([$2], [:]) + else + AC_MSG_RESULT([no]) + [ax_pc_cv_have_]_p=no + m4_default([$3], [:]) + fi + m4_ifdef([AM_CONDITIONAL], [ + AM_CONDITIONAL([HAVE_]_P, [test x"$ax_pc_cv_have_]_p[" = x"yes"]) + ]) +]) + +dnl +dnl AX_PKG_CONFIG_REQUIRE(package-name) +dnl ----------------------------------- +dnl +dnl As above, but fail if the package is not installed. +dnl +AC_DEFUN([AX_PKG_CONFIG_REQUIRE], [ + AX_PKG_CONFIG_CHECK([$1], [], [ + AC_MSG_ERROR([cannot proceed without $1]) + ]) +]) diff --git a/misc/Makefile.in b/misc/Makefile.in index bd6879ac6ba9..5909589a25de 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -90,10 +90,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = misc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -138,9 +138,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -188,6 +188,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -236,6 +239,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -268,8 +272,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -297,7 +301,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/missing b/missing index f62bbae306c7..625aeb11897a 100644 --- a/missing +++ b/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/modules/Makefile.in b/modules/Makefile.in index 683fe342cd36..660194ab0b01 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ host_triplet = @host@ @WITH_PAM_UNIX_TRUE@am__append_1 = pam_unix subdir = modules ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -137,7 +137,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -198,9 +198,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -248,6 +248,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -296,6 +299,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -328,8 +332,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -446,7 +450,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/modules/pam_deny/Makefile.in b/modules/pam_deny/Makefile.in index 7f92f93fef04..d88db341e7fe 100644 --- a/modules/pam_deny/Makefile.in +++ b/modules/pam_deny/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = modules/pam_deny ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -159,7 +159,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/pam_deny.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -220,9 +221,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -270,6 +271,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,6 +322,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -360,8 +365,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -417,7 +422,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -498,7 +509,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -571,7 +585,7 @@ clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_deny.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -617,7 +631,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_deny.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -638,19 +652,20 @@ uninstall-am: uninstall-moduleLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-moduleLTLIBRARIES \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-moduleLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-moduleLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-moduleLTLIBRARIES .PRECIOUS: Makefile diff --git a/modules/pam_permit/Makefile.in b/modules/pam_permit/Makefile.in index dbe448aaaa95..d0dd38219f60 100644 --- a/modules/pam_permit/Makefile.in +++ b/modules/pam_permit/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = modules/pam_permit ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -159,7 +159,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/pam_permit.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -220,9 +221,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -270,6 +271,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,6 +322,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -360,8 +365,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -417,7 +422,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -498,7 +509,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -571,7 +585,7 @@ clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_permit.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -617,7 +631,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_permit.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -638,19 +652,20 @@ uninstall-am: uninstall-moduleLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-moduleLTLIBRARIES \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-moduleLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-moduleLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-moduleLTLIBRARIES .PRECIOUS: Makefile diff --git a/modules/pam_return/Makefile.in b/modules/pam_return/Makefile.in index 47c52cb5cb07..450b88d839e1 100644 --- a/modules/pam_return/Makefile.in +++ b/modules/pam_return/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = modules/pam_return ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -159,7 +159,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/pam_return.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -220,9 +221,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -270,6 +271,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -318,6 +322,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -360,8 +365,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -417,7 +422,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_return.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_return.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -498,7 +509,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -571,7 +585,7 @@ clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_return.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -617,7 +631,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_return.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -638,19 +652,20 @@ uninstall-am: uninstall-moduleLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-moduleLTLIBRARIES \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-moduleLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-moduleLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-moduleLTLIBRARIES .PRECIOUS: Makefile diff --git a/modules/pam_unix/Makefile.in b/modules/pam_unix/Makefile.in index fda413dd5515..46898b50caf2 100644 --- a/modules/pam_unix/Makefile.in +++ b/modules/pam_unix/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,10 @@ build_triplet = @build@ host_triplet = @host@ subdir = modules/pam_unix ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -133,8 +133,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) am__DEPENDENCIES_1 = -@WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la \ -@WITH_SYSTEM_LIBPAM_FALSE@ $(am__DEPENDENCIES_1) +@WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la @WITH_SYSTEM_LIBPAM_TRUE@pam_unix_la_DEPENDENCIES = \ @WITH_SYSTEM_LIBPAM_TRUE@ $(am__DEPENDENCIES_1) am_pam_unix_la_OBJECTS = pam_unix.lo @@ -160,7 +159,8 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/pam_unix.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -221,9 +221,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -271,6 +271,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -319,6 +322,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -361,8 +365,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -418,7 +422,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -499,7 +509,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -572,7 +585,7 @@ clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_unix.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -618,7 +631,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/pam_unix.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -639,19 +652,20 @@ uninstall-am: uninstall-moduleLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-moduleLTLIBRARIES \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-moduleLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-moduleLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-moduleLTLIBRARIES .PRECIOUS: Makefile diff --git a/t/Makefile.am b/t/Makefile.am index 55fdb48b7e68..2cd5d21e2246 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -1,25 +1,26 @@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ +# $OpenPAM: Makefile.am 943 2019-02-20 13:23:51Z des $ if WITH_TEST -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \ + $(CRYB_TEST_CFLAGS) AM_TESTS_ENVIRONMENT = \ PAM_RETURN_SO=$(abs_top_builddir)/modules/pam_return/.libs/pam_return.so -noinst_HEADERS = t_pam_conv.h - # tests TESTS = TESTS += t_openpam_ctype TESTS += t_openpam_dispatch TESTS += t_openpam_readword TESTS += t_openpam_readlinev +TESTS += t_pam_env check_PROGRAMS = $(TESTS) # libt - common support code check_LIBRARIES = libt.a -libt_a_SOURCES = t_pam_conv.c +libt_a_SOURCES = t_pam_conv.c t_pam_err.c +noinst_HEADERS = t_pam_conv.h t_pam_err.h # link with libpam and test framework LDADD = $(CRYB_TEST_LIBS) libt.a diff --git a/t/Makefile.in b/t/Makefile.in index 002fdd8404fa..a0c5d4f18da5 100644 --- a/t/Makefile.in +++ b/t/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,7 @@ @SET_MAKE@ -# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $ +# $OpenPAM: Makefile.am 943 2019-02-20 13:23:51Z des $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -93,16 +93,17 @@ host_triplet = @host@ @WITH_TEST_TRUE@TESTS = t_openpam_ctype$(EXEEXT) \ @WITH_TEST_TRUE@ t_openpam_dispatch$(EXEEXT) \ @WITH_TEST_TRUE@ t_openpam_readword$(EXEEXT) \ -@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT) +@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT) \ +@WITH_TEST_TRUE@ t_pam_env$(EXEEXT) @WITH_TEST_TRUE@check_PROGRAMS = $(am__EXEEXT_1) @WITH_SYSTEM_LIBPAM_TRUE@@WITH_TEST_TRUE@am__append_1 = $(SYSTEM_LIBPAM) @WITH_SYSTEM_LIBPAM_FALSE@@WITH_TEST_TRUE@am__append_2 = $(top_builddir)/lib/libpam/libpam.la subdir = t ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \ @@ -111,6 +112,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +@WITH_TEST_TRUE@am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) \ +@WITH_TEST_TRUE@ t_openpam_dispatch$(EXEEXT) \ +@WITH_TEST_TRUE@ t_openpam_readword$(EXEEXT) \ +@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT) \ +@WITH_TEST_TRUE@ t_pam_env$(EXEEXT) ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) @@ -118,13 +124,10 @@ am__v_AR_0 = @echo " AR " $@; am__v_AR_1 = libt_a_AR = $(AR) $(ARFLAGS) libt_a_LIBADD = -am__libt_a_SOURCES_DIST = t_pam_conv.c -@WITH_TEST_TRUE@am_libt_a_OBJECTS = t_pam_conv.$(OBJEXT) +am__libt_a_SOURCES_DIST = t_pam_conv.c t_pam_err.c +@WITH_TEST_TRUE@am_libt_a_OBJECTS = t_pam_conv.$(OBJEXT) \ +@WITH_TEST_TRUE@ t_pam_err.$(OBJEXT) libt_a_OBJECTS = $(am_libt_a_OBJECTS) -@WITH_TEST_TRUE@am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) \ -@WITH_TEST_TRUE@ t_openpam_dispatch$(EXEEXT) \ -@WITH_TEST_TRUE@ t_openpam_readword$(EXEEXT) \ -@WITH_TEST_TRUE@ t_openpam_readlinev$(EXEEXT) t_openpam_ctype_SOURCES = t_openpam_ctype.c t_openpam_ctype_OBJECTS = t_openpam_ctype.$(OBJEXT) t_openpam_ctype_LDADD = $(LDADD) @@ -154,6 +157,11 @@ t_openpam_readword_LDADD = $(LDADD) @WITH_TEST_TRUE@t_openpam_readword_DEPENDENCIES = \ @WITH_TEST_TRUE@ $(am__DEPENDENCIES_1) libt.a \ @WITH_TEST_TRUE@ $(am__DEPENDENCIES_2) $(am__append_2) +t_pam_env_SOURCES = t_pam_env.c +t_pam_env_OBJECTS = t_pam_env.$(OBJEXT) +t_pam_env_LDADD = $(LDADD) +@WITH_TEST_TRUE@t_pam_env_DEPENDENCIES = $(am__DEPENDENCIES_1) libt.a \ +@WITH_TEST_TRUE@ $(am__DEPENDENCIES_2) $(am__append_2) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -168,7 +176,12 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/t_openpam_ctype.Po \ + ./$(DEPDIR)/t_openpam_dispatch.Po \ + ./$(DEPDIR)/t_openpam_readlinev.Po \ + ./$(DEPDIR)/t_openpam_readword.Po ./$(DEPDIR)/t_pam_conv.Po \ + ./$(DEPDIR)/t_pam_env.Po ./$(DEPDIR)/t_pam_err.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -189,16 +202,16 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libt_a_SOURCES) t_openpam_ctype.c t_openpam_dispatch.c \ - t_openpam_readlinev.c t_openpam_readword.c + t_openpam_readlinev.c t_openpam_readword.c t_pam_env.c DIST_SOURCES = $(am__libt_a_SOURCES_DIST) t_openpam_ctype.c \ t_openpam_dispatch.c t_openpam_readlinev.c \ - t_openpam_readword.c + t_openpam_readword.c t_pam_env.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__noinst_HEADERS_DIST = t_pam_conv.h +am__noinst_HEADERS_DIST = t_pam_conv.h t_pam_err.h HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -439,9 +452,9 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@ CRYB_TEST_LIBS = @CRYB_TEST_LIBS@ -CRYPTO_LIBS = @CRYPTO_LIBS@ -CRYPT_LIBS = @CRYPT_LIBS@ +CRYB_TEST_VERSION = @CRYB_TEST_VERSION@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -489,6 +502,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -537,6 +553,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -548,15 +565,17 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@WITH_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam +@WITH_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \ +@WITH_TEST_TRUE@ $(CRYB_TEST_CFLAGS) + @WITH_TEST_TRUE@AM_TESTS_ENVIRONMENT = \ @WITH_TEST_TRUE@ PAM_RETURN_SO=$(abs_top_builddir)/modules/pam_return/.libs/pam_return.so -@WITH_TEST_TRUE@noinst_HEADERS = t_pam_conv.h # libt - common support code @WITH_TEST_TRUE@check_LIBRARIES = libt.a -@WITH_TEST_TRUE@libt_a_SOURCES = t_pam_conv.c +@WITH_TEST_TRUE@libt_a_SOURCES = t_pam_conv.c t_pam_err.c +@WITH_TEST_TRUE@noinst_HEADERS = t_pam_conv.h t_pam_err.h # link with libpam and test framework @WITH_TEST_TRUE@LDADD = $(CRYB_TEST_LIBS) libt.a $(am__append_1) \ @@ -582,8 +601,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -595,14 +614,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-checkLIBRARIES: - -test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES) - -libt.a: $(libt_a_OBJECTS) $(libt_a_DEPENDENCIES) $(EXTRA_libt_a_DEPENDENCIES) - $(AM_V_at)-rm -f libt.a - $(AM_V_AR)$(libt_a_AR) libt.a $(libt_a_OBJECTS) $(libt_a_LIBADD) - $(AM_V_at)$(RANLIB) libt.a - clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -612,6 +623,14 @@ clean-checkPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +clean-checkLIBRARIES: + -test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES) + +libt.a: $(libt_a_OBJECTS) $(libt_a_DEPENDENCIES) $(EXTRA_libt_a_DEPENDENCIES) + $(AM_V_at)-rm -f libt.a + $(AM_V_AR)$(libt_a_AR) libt.a $(libt_a_OBJECTS) $(libt_a_LIBADD) + $(AM_V_at)$(RANLIB) libt.a + t_openpam_ctype$(EXEEXT): $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_DEPENDENCIES) $(EXTRA_t_openpam_ctype_DEPENDENCIES) @rm -f t_openpam_ctype$(EXEEXT) $(AM_V_CCLD)$(LINK) $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_LDADD) $(LIBS) @@ -628,17 +647,29 @@ t_openpam_readword$(EXEEXT): $(t_openpam_readword_OBJECTS) $(t_openpam_readword_ @rm -f t_openpam_readword$(EXEEXT) $(AM_V_CCLD)$(LINK) $(t_openpam_readword_OBJECTS) $(t_openpam_readword_LDADD) $(LIBS) +t_pam_env$(EXEEXT): $(t_pam_env_OBJECTS) $(t_pam_env_DEPENDENCIES) $(EXTRA_t_pam_env_DEPENDENCIES) + @rm -f t_pam_env$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(t_pam_env_OBJECTS) $(t_pam_env_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_dispatch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_conv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_dispatch.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_conv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_env.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_err.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -839,7 +870,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) $(check_LIBRARIES) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -849,7 +880,7 @@ check-TESTS: log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all $(check_LIBRARIES) $(check_PROGRAMS) +recheck: all $(check_PROGRAMS) $(check_LIBRARIES) @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ @@ -888,6 +919,13 @@ t_openpam_readlinev.log: t_openpam_readlinev$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +t_pam_env.log: t_pam_env$(EXEEXT) + @p='t_pam_env$(EXEEXT)'; \ + b='t_pam_env'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ @@ -903,7 +941,10 @@ t_openpam_readlinev.log: t_openpam_readlinev$(EXEEXT) @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -934,7 +975,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_LIBRARIES) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LIBRARIES) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(HEADERS) @@ -978,7 +1019,13 @@ clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \ clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/t_openpam_ctype.Po + -rm -f ./$(DEPDIR)/t_openpam_dispatch.Po + -rm -f ./$(DEPDIR)/t_openpam_readlinev.Po + -rm -f ./$(DEPDIR)/t_openpam_readword.Po + -rm -f ./$(DEPDIR)/t_pam_conv.Po + -rm -f ./$(DEPDIR)/t_pam_env.Po + -rm -f ./$(DEPDIR)/t_pam_err.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1024,7 +1071,13 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/t_openpam_ctype.Po + -rm -f ./$(DEPDIR)/t_openpam_dispatch.Po + -rm -f ./$(DEPDIR)/t_openpam_readlinev.Po + -rm -f ./$(DEPDIR)/t_openpam_readword.Po + -rm -f ./$(DEPDIR)/t_pam_conv.Po + -rm -f ./$(DEPDIR)/t_pam_env.Po + -rm -f ./$(DEPDIR)/t_pam_err.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1045,20 +1098,20 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ - clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \ - clean-libtool cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am recheck tags tags-am uninstall \ - uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-checkLIBRARIES clean-checkPROGRAMS \ + clean-generic clean-libtool cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff --git a/t/t_pam_env.c b/t/t_pam_env.c new file mode 100644 index 000000000000..3f0174592c58 --- /dev/null +++ b/t/t_pam_env.c @@ -0,0 +1,202 @@ +/*- + * Copyright (c) 2019 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $OpenPAM$ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include + +#include +#include + +#include "t_pam_err.h" + +#define T_ENV_NAME "MAGIC_WORDS" +#define T_ENV_VALUE "SQUEAMISH OSSIFRAGE" +#define T_ENV_NAMEVALUE T_ENV_NAME "=" T_ENV_VALUE + +struct pam_conv t_null_pamc; + + +/*************************************************************************** + * Tests + */ + +static int +t_env_empty(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED) +{ + pam_handle_t *pamh; + char **envlist; + int pam_err, ret; + + ret = 1; + pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh); + t_assert(pam_err == PAM_SUCCESS); + envlist = pam_getenvlist(pamh); + ret &= t_is_not_null(envlist); + if (envlist != NULL) { + ret &= t_is_null(*envlist); + openpam_free_envlist(envlist); + } + pam_end(pamh, pam_err); + return (ret); +} + +static int +t_putenv_simple(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED) +{ + pam_handle_t *pamh; + char **envlist; + int pam_err, ret; + + ret = 1; + pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh); + t_assert(pam_err == PAM_SUCCESS); + pam_err = pam_putenv(pamh, T_ENV_NAMEVALUE); + ret &= t_compare_pam_err(PAM_SUCCESS, pam_err); + envlist = pam_getenvlist(pamh); + ret &= t_is_not_null(envlist); + if (envlist != NULL) { + ret &= t_compare_str(T_ENV_NAMEVALUE, envlist[0]) + & t_is_null(envlist[1]); + openpam_free_envlist(envlist); + } + pam_end(pamh, pam_err); + return (ret); +} + +static int +t_setenv_simple(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED) +{ + pam_handle_t *pamh; + char **envlist; + int pam_err, ret; + + ret = 1; + pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh); + t_assert(pam_err == PAM_SUCCESS); + pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0); + ret &= t_compare_pam_err(PAM_SUCCESS, pam_err); + envlist = pam_getenvlist(pamh); + ret &= t_is_not_null(envlist); + if (envlist != NULL) { + ret &= t_compare_str(T_ENV_NAMEVALUE, envlist[0]) + & t_is_null(envlist[1]); + openpam_free_envlist(envlist); + } + pam_end(pamh, pam_err); + return (ret); +} + +static int +t_getenv_empty(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED) +{ + pam_handle_t *pamh; + const char *value; + int pam_err, ret; + + ret = 1; + pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh); + t_assert(pam_err == PAM_SUCCESS); + value = pam_getenv(pamh, T_ENV_NAME); + ret &= t_compare_str(NULL, value); + pam_end(pamh, pam_err); + return (ret); +} + +static int +t_getenv_simple_miss(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED) +{ + pam_handle_t *pamh; + const char *value; + int pam_err, ret; + + ret = 1; + pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh); + t_assert(pam_err == PAM_SUCCESS); + pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0); + t_assert(pam_err == PAM_SUCCESS); + value = pam_getenv(pamh, "XYZZY"); + ret &= t_compare_str(NULL, value); + pam_end(pamh, pam_err); + return (ret); +} + +static int +t_getenv_simple_hit(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED) +{ + pam_handle_t *pamh; + const char *value; + int pam_err, ret; + + ret = 1; + pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh); + t_assert(pam_err == PAM_SUCCESS); + pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0); + t_assert(pam_err == PAM_SUCCESS); + value = pam_getenv(pamh, T_ENV_NAME); + ret &= t_compare_str(T_ENV_VALUE, value); + pam_end(pamh, pam_err); + return (ret); +} + + +/*************************************************************************** + * Boilerplate + */ + +static int +t_prepare(int argc CRYB_UNUSED, char *argv[] CRYB_UNUSED) +{ + + openpam_set_feature(OPENPAM_FALLBACK_TO_OTHER, 0); + + t_add_test(t_env_empty, NULL, "initially empty"); + t_add_test(t_putenv_simple, NULL, "put - simple"); + t_add_test(t_setenv_simple, NULL, "set - simple"); + t_add_test(t_getenv_empty, NULL, "get - empty"); + t_add_test(t_getenv_simple_miss, NULL, "get - simple (miss)"); + t_add_test(t_getenv_simple_hit, NULL, "get - simple (hit)"); + + return (0); +} + +int +main(int argc, char *argv[]) +{ + + t_main(t_prepare, NULL, argc, argv); +} diff --git a/t/t_pam_err.c b/t/t_pam_err.c new file mode 100644 index 000000000000..8c97a129dcb7 --- /dev/null +++ b/t/t_pam_err.c @@ -0,0 +1,63 @@ +/*- + * Copyright (c) 2019 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $OpenPAM$ + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include + +#include +#include + +#include "openpam_impl.h" + +#include "t_pam_err.h" + +int +t_compare_pam_err(int expected, int received) +{ + + if (expected == received) + return (1); + if (expected >= 0 && expected < PAM_NUM_ERRORS) + t_printv("expected %s, ", pam_err_name[expected]); + else + t_printv("expected %d, ", expected); + if (received >= 0 && received < PAM_NUM_ERRORS) + t_printv("received %s\n", pam_err_name[received]); + else + t_printv("received %d\n", received); + return (0); +} diff --git a/t/t_pam_err.h b/t/t_pam_err.h new file mode 100644 index 000000000000..612bb7580197 --- /dev/null +++ b/t/t_pam_err.h @@ -0,0 +1,44 @@ +/*- + * Copyright (c) 2019 Dag-Erling Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $OpenPAM$ + */ + +#ifndef T_PAM_ERR_H_INCLUDED +#define T_PAM_ERR_H_INCLUDED + +int t_compare_pam_err(int, int); + +static inline int +t_pam_success(int received) +{ + + return t_compare_pam_err(PAM_SUCCESS, received); +} + +#endif diff --git a/test-driver b/test-driver index 8e575b017d93..0218a01f616e 100755 --- a/test-driver +++ b/test-driver @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -143,6 +143,6 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: From 6aeb44070cfcb3431ef7e206201f7272e6804067 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 25 Feb 2019 13:15:34 +0000 Subject: [PATCH 03/16] Check the index hasn't changed after writing the cmp entry. If an interrupt fires while writing the cmp entry we may have a partial entry. Work around this by using atomic_cmpset to set the new index. If it fails we need to set the previous index value and try again as the entry may be in an inconsistent state. This fixes messages similar to the following from syzkaller: bad comp 224 type 2163727253 Reviewed by: tuexen Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D19287 --- sys/kern/kern_kcov.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_kcov.c b/sys/kern/kern_kcov.c index 5b17a6ca5f44..c7a486e4f511 100644 --- a/sys/kern/kern_kcov.c +++ b/sys/kern/kern_kcov.c @@ -247,11 +247,16 @@ trace_cmp(uint64_t type, uint64_t arg1, uint64_t arg2, uint64_t ret) if (index * 4 + 4 + 1 > info->entries) return (false); - buf[index * 4 + 1] = type; - buf[index * 4 + 2] = arg1; - buf[index * 4 + 3] = arg2; - buf[index * 4 + 4] = ret; - buf[0] = index + 1; + while (1) { + buf[index * 4 + 1] = type; + buf[index * 4 + 2] = arg1; + buf[index * 4 + 3] = arg2; + buf[index * 4 + 4] = ret; + + if (atomic_cmpset_64(&buf[0], index, index + 1)) + break; + buf[0] = index; + } return (true); } From c9bb1ab3c99abc03dafb237f4faa136ac914ef29 Mon Sep 17 00:00:00 2001 From: 0mp <0mp@FreeBSD.org> Date: Mon, 25 Feb 2019 15:03:50 +0000 Subject: [PATCH 04/16] Add missing types to the sysctl(9) manual page Update the diff to include other missing sysctl types found in sysctl.h. Some of these sysctls are already documented in other pages (e.g counter(9) and ZONE(9)), but they should at least be mentioned here for completeness. This patch now documents all of the following: - SYSCTL_BOOL/SYSCTL_ADD_BOOL - SYSCTL_COUNTER_U64/SYSCTL_ADD_COUNTER_U64 - SYSCTL_COUNTER_U64_ARRAY/SYSCTL_ADD_COUNTER_U64_ARRAY - SYSCTL_SBINTIME_MSEC/SYSCTL_ADD_SBINTIME_MSEC - SYSCTL_SBINTIME_USEC/SYSCTL_ADD_SBINTIME_USEC - SYSCTL_UMA_CUR/SYSCTL_ADD_UMA_CUR - SYSCTL_UMA_MAX/SYSCTL_ADD_UMA_MAX Submitted by: mhorne063_gmail.com Reviewed by: bcr, hselasky Approved by: bcr (doc), hselasky (src) Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D19272 --- share/man/man9/sysctl.9 | 119 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 5 deletions(-) diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index 09c56871d7e9..9f81f2a7d777 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -25,11 +25,14 @@ .\" .\" $FreeBSD$ .\" -.Dd June 1, 2018 +.Dd February 25, 2019 .Dt SYSCTL 9 .Os .Sh NAME .Nm SYSCTL_DECL , +.Nm SYSCTL_ADD_BOOL , +.Nm SYSCTL_ADD_COUNTER_U64 , +.Nm SYSCTL_ADD_COUNTER_U64_ARRAY , .Nm SYSCTL_ADD_INT , .Nm SYSCTL_ADD_LONG , .Nm SYSCTL_ADD_NODE , @@ -42,6 +45,8 @@ .Nm SYSCTL_ADD_S16 , .Nm SYSCTL_ADD_S32 , .Nm SYSCTL_ADD_S64 , +.Nm SYSCTL_ADD_SBINTIME_MSEC , +.Nm SYSCTL_ADD_SBINTIME_USEC , .Nm SYSCTL_ADD_STRING , .Nm SYSCTL_ADD_STRUCT , .Nm SYSCTL_ADD_U8 , @@ -52,10 +57,15 @@ .Nm SYSCTL_ADD_UINT , .Nm SYSCTL_ADD_ULONG , .Nm SYSCTL_ADD_UQUAD , +.Nm SYSCTL_ADD_UMA_CUR , +.Nm SYSCTL_ADD_UMA_MAX , .Nm SYSCTL_CHILDREN , .Nm SYSCTL_STATIC_CHILDREN , .Nm SYSCTL_NODE_CHILDREN , .Nm SYSCTL_PARENT , +.Nm SYSCTL_BOOL , +.Nm SYSCTL_COUNTER_U64 , +.Nm SYSCTL_COUNTER_U64_ARRAY , .Nm SYSCTL_INT , .Nm SYSCTL_INT_WITH_LABEL , .Nm SYSCTL_LONG , @@ -69,6 +79,8 @@ .Nm SYSCTL_S16 , .Nm SYSCTL_S32 , .Nm SYSCTL_S64 , +.Nm SYSCTL_SBINTIME_MSEC , +.Nm SYSCTL_SBINTIME_USEC , .Nm SYSCTL_STRING , .Nm SYSCTL_STRUCT , .Nm SYSCTL_U8 , @@ -77,13 +89,47 @@ .Nm SYSCTL_U64 , .Nm SYSCTL_UINT , .Nm SYSCTL_ULONG , -.Nm SYSCTL_UQUAD +.Nm SYSCTL_UQUAD , +.Nm SYSCTL_UMA_CUR , +.Nm SYSCTL_UMA_MAX .Nd Dynamic and static sysctl MIB creation functions .Sh SYNOPSIS .In sys/param.h .In sys/sysctl.h .Fn SYSCTL_DECL name .Ft struct sysctl_oid * +.Fo SYSCTL_ADD_BOOL +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "bool *ptr" +.Fa "uint8_t val" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * +.Fo SYSCTL_ADD_COUNTER_U64 +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "counter_u64_t *ptr" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * +.Fo SYSCTL_ADD_COUNTER_U64_ARRAY +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "counter_u64_t *ptr" +.Fa "intmax_t len" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * .Fo SYSCTL_ADD_INT .Fa "struct sysctl_ctx_list *ctx" .Fa "struct sysctl_oid_list *parent" @@ -214,6 +260,26 @@ .Fa "const char *descr" .Fc .Ft struct sysctl_oid * +.Fo SYSCTL_ADD_SBINTIME_MSEC +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "sbintime_t *ptr" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * +.Fo SYSCTL_ADD_SBINTIME_USEC +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "sbintime_t *ptr" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * .Fo SYSCTL_ADD_STRING .Fa "struct sysctl_ctx_list *ctx" .Fa "struct sysctl_oid_list *parent" @@ -311,6 +377,27 @@ .Fa "const char *descr" .Fc .Ft struct sysctl_oid * +.Fo SYSCTL_ADD_UMA_CUR +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "uma_zone_t ptr" +.Fa "const char *descr" +.Fc +.Ft struct sysctl_oid * +.Fo SYSCTL_ADD_UMA_MAX +.Fa "struct sysctl_ctx_list *ctx" +.Fa "struct sysctl_oid_list *parent" +.Fa "int number" +.Fa "const char *name" +.Fa "int ctlflags" +.Fa "uma_zone_t ptr" +.Fa "const char *descr" +.Fc +.Fa "const char *descr" +.Ft struct sysctl_oid * .Fo SYSCTL_ADD_UAUTO .Fa "struct sysctl_ctx_list *ctx" .Fa "struct sysctl_oid_list *parent" @@ -337,6 +424,9 @@ .Fo SYSCTL_PARENT .Fa "struct sysctl_oid *oid" .Fc +.Fn SYSCTL_BOOL parent number name ctlflags ptr val descr +.Fn SYSCTL_COUNTER_U64 parent number name ctlflags ptr descr +.Fn SYSCTL_COUNTER_U64_ARRAY parent number name ctlflags ptr len descr .Fn SYSCTL_INT parent number name ctlflags ptr val descr .Fn SYSCTL_INT_WITH_LABEL parent number name ctlflags ptr val descr label .Fn SYSCTL_LONG parent number name ctlflags ptr val descr @@ -350,6 +440,8 @@ .Fn SYSCTL_S16 parent number name ctlflags ptr val descr .Fn SYSCTL_S32 parent number name ctlflags ptr val descr .Fn SYSCTL_S64 parent number name ctlflags ptr val descr +.Fn SYSCTL_SBINTIME_MSEC parent number name ctlflags ptr descr +.Fn SYSCTL_SBINTIME_USEC parent number name ctlflags ptr descr .Fn SYSCTL_STRING parent number name ctlflags arg len descr .Fn SYSCTL_STRUCT parent number name ctlflags ptr struct_type descr .Fn SYSCTL_U8 parent number name ctlflags ptr val descr @@ -359,6 +451,8 @@ .Fn SYSCTL_UINT parent number name ctlflags ptr val descr .Fn SYSCTL_ULONG parent number name ctlflags ptr val descr .Fn SYSCTL_UQUAD parent number name ctlflags ptr val descr +.Fn SYSCTL_UMA_MAX parent number name ctlflags ptr descr +.Fn SYSCTL_UMA_CUR parent number name ctlflags ptr descr .Sh DESCRIPTION The .Nm SYSCTL @@ -416,6 +510,7 @@ argument. For string type OIDs a length of zero means that .Xr strlen 3 will be used to get the length of the string at each access to the OID. +For array type OIDs the length must be greater than zero. .It Fa ptr Pointer to sysctl variable or string data. For sysctl values the pointer can be SYSCTL_NULL_XXX_PTR which means the OID is read-only and the returned value should be taken from the @@ -544,6 +639,9 @@ This OID type is especially useful if the kernel data is not easily accessible, or needs to be processed before exporting. .Sh CREATING A STATIC SYSCTL Static sysctls are declared using one of the +.Fn SYSCTL_BOOL , +.Fn SYSCTL_COUNTER_U64 , +.Fn SYSCTL_COUNTER_U64_ARRAY , .Fn SYSCTL_INT , .Fn SYSCTL_INT_WITH_LABEL , .Fn SYSCTL_LONG , @@ -557,6 +655,8 @@ Static sysctls are declared using one of the .Fn SYSCTL_S16 , .Fn SYSCTL_S32 , .Fn SYSCTL_S64 , +.Fn SYSCTL_SBINTIME_MSEC , +.Fn SYSCTL_SBINTIME_USEC , .Fn SYSCTL_STRING , .Fn SYSCTL_STRUCT , .Fn SYSCTL_U8 , @@ -564,12 +664,17 @@ Static sysctls are declared using one of the .Fn SYSCTL_U32 , .Fn SYSCTL_U64 , .Fn SYSCTL_UINT , -.Fn SYSCTL_ULONG +.Fn SYSCTL_ULONG , +.Fn SYSCTL_UQUAD , +.Fn SYSCTL_UMA_CUR or -.Fn SYSCTL_UQUAD +.Fn SYSCTL_UMA_MAX macros. .Sh CREATING A DYNAMIC SYSCTL Dynamic nodes are created using one of the +.Fn SYSCTL_ADD_BOOL , +.Fn SYSCTL_ADD_COUNTER_U64 , +.Fn SYSCTL_ADD_COUNTER_U64_ARRAY , .Fn SYSCTL_ADD_INT , .Fn SYSCTL_ADD_LONG , .Fn SYSCTL_ADD_NODE , @@ -582,6 +687,8 @@ Dynamic nodes are created using one of the .Fn SYSCTL_ADD_S16 , .Fn SYSCTL_ADD_S32 , .Fn SYSCTL_ADD_S64 , +.Fn SYSCTL_ADD_SBINTIME_MSEC , +.Fn SYSCTL_ADD_SBINTIME_USEC , .Fn SYSCTL_ADD_STRING , .Fn SYSCTL_ADD_STRUCT , .Fn SYSCTL_ADD_U8 , @@ -591,8 +698,10 @@ Dynamic nodes are created using one of the .Fn SYSCTL_ADD_UAUTO , .Fn SYSCTL_ADD_UINT , .Fn SYSCTL_ADD_ULONG , +.Fn SYSCTL_ADD_UQUAD , +.Fn SYSCTL_ADD_UMA_CUR or -.Fn SYSCTL_UQUAD +.Fn SYSCTL_ADD_UMA_MAX functions. See .Xr sysctl_remove_oid 9 From 48c552a3c7bf98e9455e9be2f6870284e296e4c2 Mon Sep 17 00:00:00 2001 From: np Date: Mon, 25 Feb 2019 15:47:22 +0000 Subject: [PATCH 05/16] cxgbe(4): Use correct port_info in the call to is_bt(). This fixes a panic during configuration if the tx channel of a port isn't the same as its port id. Reported by: Fabrice Bruel MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/t4_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c index 5c587f04da7b..3fab4dee59a6 100644 --- a/sys/dev/cxgbe/common/t4_hw.c +++ b/sys/dev/cxgbe/common/t4_hw.c @@ -3894,7 +3894,7 @@ int t4_link_l1cfg(struct adapter *adap, unsigned int mbox, unsigned int port, speed = fwcap_top_speed(lc->supported); /* Force AN on for BT cards. */ - if (is_bt(adap->port[port])) + if (is_bt(adap->port[adap->chan_map[port]])) aneg = lc->supported & FW_PORT_CAP32_ANEG; rcap = aneg | speed | fc | fec; From 95c889a8075384596917595163bb93c69baf0411 Mon Sep 17 00:00:00 2001 From: ian Date: Mon, 25 Feb 2019 16:20:58 +0000 Subject: [PATCH 06/16] Include the jedec "extended device information string" in the criteria used to match a chip to our table of metadata describing the chips. At least one new DataFlash chip has a 3-byte jedec ID identical to its predecessors and differs only in the extended info, and it has different metadata requiring a unique entry in the table. This paves the way for supporting such chips. The metadata table now includes two new fields, extmask and extid. The two bytes of extended info obtained from the chip are ANDed with extmask then compared to extid, so it's possible to use only a subset of the extended info in the matching. We now always read 6 bytes of jedec ID info. Most chips don't return any extended info, and the values read back for those two bytes may be indeterminate, but such chips have extmask and extid values of 0x0000 in the table, so the extid effectively doesn't participate in the matching on those chips and it doesn't matter what they return in the extended info bytes. --- sys/dev/flash/at45d.c | 68 ++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index f129e40ffd98..91a4da1074b4 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -62,10 +63,22 @@ static struct ofw_compat_data compat_data[] = { SPIBUS_PNP_INFO(compat_data); #endif +/* This is the information returned by the MANUFACTURER_ID command. */ +struct at45d_mfg_info { + uint32_t jedec_id; /* Mfg ID, DevId1, DevId2, ExtLen */ + uint16_t ext_id; /* ExtId1, ExtId2 */ +}; + +/* + * This is an entry in our table of metadata describing the chips. We match on + * both jedec id and extended id info returned by the MANUFACTURER_ID command. + */ struct at45d_flash_ident { const char *name; uint32_t jedec; + uint16_t extid; + uint16_t extmask; uint16_t pagecount; uint16_t pageoffset; uint16_t pagesize; @@ -111,7 +124,7 @@ static void at45d_task(void *arg); /* helper routines */ static void at45d_delayed_attach(void *xsc); -static int at45d_get_mfg_info(device_t dev, uint8_t *resp); +static int at45d_get_mfg_info(device_t dev, struct at45d_mfg_info *resp); static int at45d_get_status(device_t dev, uint8_t *status); static int at45d_wait_ready(device_t dev, uint8_t *status); @@ -123,19 +136,28 @@ static int at45d_wait_ready(device_t dev, uint8_t *status); #define CONTINUOUS_ARRAY_READ 0xe8 /* + * Metadata for supported chips. + * + * The jedec id in this table includes the extended id length byte. A match is + * based on both jedec id and extended id matching. The chip's extended id (not + * present in most chips) is ANDed with ExtMask and the result is compared to + * ExtId. If a chip only returns 1 ext id byte it will be in the upper 8 bits + * of ExtId in this table. + * * A sectorsize2n != 0 is used to indicate that a device optionally supports * 2^N byte pages. If support for the latter is enabled, the sector offset * has to be reduced by one. */ static const struct at45d_flash_ident at45d_flash_devices[] = { - { "AT45DB011B", 0x1f2200, 512, 9, 264, 256 }, - { "AT45DB021B", 0x1f2300, 1024, 9, 264, 256 }, - { "AT45DB041x", 0x1f2400, 2028, 9, 264, 256 }, - { "AT45DB081B", 0x1f2500, 4096, 9, 264, 256 }, - { "AT45DB161x", 0x1f2600, 4096, 10, 528, 512 }, - { "AT45DB321x", 0x1f2700, 8192, 10, 528, 0 }, - { "AT45DB321x", 0x1f2701, 8192, 10, 528, 512 }, - { "AT45DB642x", 0x1f2800, 8192, 11, 1056, 1024 } + /* Part Name Jedec ID ExtId ExtMask PgCnt Offs PgSz PgSz2n */ + { "AT45DB011B", 0x1f220000, 0x0000, 0x0000, 512, 9, 264, 256 }, + { "AT45DB021B", 0x1f230000, 0x0000, 0x0000, 1024, 9, 264, 256 }, + { "AT45DB041x", 0x1f240000, 0x0000, 0x0000, 2028, 9, 264, 256 }, + { "AT45DB081B", 0x1f250000, 0x0000, 0x0000, 4096, 9, 264, 256 }, + { "AT45DB161x", 0x1f260000, 0x0000, 0x0000, 4096, 10, 528, 512 }, + { "AT45DB321x", 0x1f270000, 0x0000, 0x0000, 8192, 10, 528, 0 }, + { "AT45DB321x", 0x1f270100, 0x0000, 0x0000, 8192, 10, 528, 512 }, + { "AT45DB642x", 0x1f280000, 0x0000, 0x0000, 8192, 11, 1056, 1024 }, }; static int @@ -159,7 +181,7 @@ at45d_get_status(device_t dev, uint8_t *status) } static int -at45d_get_mfg_info(device_t dev, uint8_t *resp) +at45d_get_mfg_info(device_t dev, struct at45d_mfg_info *resp) { uint8_t rxBuf[8], txBuf[8]; struct spi_command cmd; @@ -172,11 +194,14 @@ at45d_get_mfg_info(device_t dev, uint8_t *resp) txBuf[0] = MANUFACTURER_ID; cmd.tx_cmd = &txBuf; cmd.rx_cmd = &rxBuf; - cmd.tx_cmd_sz = cmd.rx_cmd_sz = 5; + cmd.tx_cmd_sz = cmd.rx_cmd_sz = 7; err = SPIBUS_TRANSFER(device_get_parent(dev), dev, &cmd); if (err) return (err); - memcpy(resp, rxBuf + 1, 4); + + resp->jedec_id = be32dec(rxBuf + 1); + resp->ext_id = be16dec(rxBuf + 5); + return (0); } @@ -268,11 +293,12 @@ static void at45d_delayed_attach(void *xsc) { struct at45d_softc *sc; + struct at45d_mfg_info mfginfo; const struct at45d_flash_ident *ident; u_int i; uint32_t jedec; uint16_t pagesize; - uint8_t buf[4], status; + uint8_t status; sc = xsc; ident = NULL; @@ -282,19 +308,18 @@ at45d_delayed_attach(void *xsc) device_printf(sc->dev, "Error waiting for device-ready.\n"); return; } - if (at45d_get_mfg_info(sc->dev, buf) != 0) { + if (at45d_get_mfg_info(sc->dev, &mfginfo) != 0) { device_printf(sc->dev, "Failed to get ID.\n"); return; } - - jedec = buf[0] << 16 | buf[1] << 8 | buf[2]; for (i = 0; i < nitems(at45d_flash_devices); i++) { - if (at45d_flash_devices[i].jedec == jedec) { - ident = &at45d_flash_devices[i]; + ident = &at45d_flash_devices[i]; + if (mfginfo.jedec_id == ident->jedec && + (mfginfo.ext_id & ident->extmask) == ident->extid) { break; } } - if (ident == NULL) { + if (i == nitems(at45d_flash_devices)) { device_printf(sc->dev, "JEDEC 0x%x not in list.\n", jedec); return; } @@ -322,8 +347,9 @@ at45d_delayed_attach(void *xsc) bioq_init(&sc->bio_queue); kproc_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash"); sc->taskstate = TSTATE_RUNNING; - device_printf(sc->dev, "%s, %d bytes per page, %d pages\n", - ident->name, pagesize, ident->pagecount); + device_printf(sc->dev, "%s, %d bytes per page, %d pages; %d KBytes\n", + ident->name, pagesize, ident->pagecount, + (pagesize * ident->pagecount) / 1024); } static int From f1de0f6a3c05c5a262f6bafe31e2905d08a8cd24 Mon Sep 17 00:00:00 2001 From: np Date: Mon, 25 Feb 2019 16:28:13 +0000 Subject: [PATCH 07/16] cxgbe(4): Updates to the default and hashfilter configurations. - Do not use nvf = 4 as it is not really supported by the firmware. Firmwares 1.23.3.0 and above will ignore it silently. - Increase PF4's share of the VIs and let it use all of the RSS table. MFC after: 2 weeks Sponsored by: Chelsio Communications --- sys/dev/cxgbe/firmware/t4fw_cfg.txt | 64 +++++++++---------- sys/dev/cxgbe/firmware/t5fw_cfg.txt | 64 +++++++++---------- .../cxgbe/firmware/t5fw_cfg_hashfilter.txt | 64 +++++++++---------- sys/dev/cxgbe/firmware/t6fw_cfg.txt | 64 +++++++++---------- .../cxgbe/firmware/t6fw_cfg_hashfilter.txt | 64 +++++++++---------- 5 files changed, 150 insertions(+), 170 deletions(-) diff --git a/sys/dev/cxgbe/firmware/t4fw_cfg.txt b/sys/dev/cxgbe/firmware/t4fw_cfg.txt index 11721a1ed648..17fd9a8f5f1c 100644 --- a/sys/dev/cxgbe/firmware/t4fw_cfg.txt +++ b/sys/dev/cxgbe/firmware/t4fw_cfg.txt @@ -46,54 +46,50 @@ # PFs 0-3. These get 8 MSI/8 MSI-X vectors each. VFs are supported by # these 4 PFs only. [function "0"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x1 [function "1"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x2 [function "2"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x4 [function "3"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x8 @@ -103,7 +99,7 @@ wx_caps = all r_caps = all nvi = 32 - rssnvi = 8 + rssnvi = 16 niqflint = 512 nethctrl = 1024 neq = 2048 @@ -166,7 +162,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -178,7 +174,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -190,7 +186,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -202,7 +198,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -246,7 +242,7 @@ [fini] version = 0x1 - checksum = 0x159b9295 + checksum = 0x3ecbe8a0 # # $FreeBSD$ # diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg.txt b/sys/dev/cxgbe/firmware/t5fw_cfg.txt index f42966c62e49..8d93b2e16a93 100644 --- a/sys/dev/cxgbe/firmware/t5fw_cfg.txt +++ b/sys/dev/cxgbe/firmware/t5fw_cfg.txt @@ -90,54 +90,50 @@ # PFs 0-3. These get 8 MSI/8 MSI-X vectors each. VFs are supported by # these 4 PFs only. [function "0"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x1 [function "1"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x2 [function "2"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x4 [function "3"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x8 @@ -147,7 +143,7 @@ wx_caps = all r_caps = all nvi = 32 - rssnvi = 8 + rssnvi = 16 niqflint = 512 nethctrl = 1024 neq = 2048 @@ -211,7 +207,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -223,7 +219,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -235,7 +231,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -247,7 +243,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -291,7 +287,7 @@ [fini] version = 0x1 - checksum = 0x30b6a157 + checksum = 0x34da8705 # # $FreeBSD$ # diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt b/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt index 7a39f3bc6983..05d13d80d1c4 100644 --- a/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt +++ b/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt @@ -99,54 +99,50 @@ # PFs 0-3. These get 8 MSI/8 MSI-X vectors each. VFs are supported by # these 4 PFs only. [function "0"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x1 [function "1"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x2 [function "2"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x4 [function "3"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x8 @@ -156,7 +152,7 @@ wx_caps = all r_caps = all nvi = 32 - rssnvi = 8 + rssnvi = 16 niqflint = 512 nethctrl = 1024 neq = 2048 @@ -214,7 +210,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -226,7 +222,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -238,7 +234,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -250,7 +246,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -294,7 +290,7 @@ [fini] version = 0x1 - checksum = 0x380a0a4 + checksum = 0x7a962d44 # # $FreeBSD$ # diff --git a/sys/dev/cxgbe/firmware/t6fw_cfg.txt b/sys/dev/cxgbe/firmware/t6fw_cfg.txt index c542cfcadf5e..a53bd673fa7a 100644 --- a/sys/dev/cxgbe/firmware/t6fw_cfg.txt +++ b/sys/dev/cxgbe/firmware/t6fw_cfg.txt @@ -88,54 +88,50 @@ # PFs 0-3. These get 8 MSI/8 MSI-X vectors each. VFs are supported by # these 4 PFs only. [function "0"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x1 [function "1"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x2 [function "2"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x4 [function "3"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x8 @@ -145,7 +141,7 @@ wx_caps = all r_caps = all nvi = 32 - rssnvi = 8 + rssnvi = 32 niqflint = 512 nethctrl = 1024 neq = 2048 @@ -212,7 +208,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -224,7 +220,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -236,7 +232,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -248,7 +244,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -276,7 +272,7 @@ [fini] version = 0x1 - checksum = 0xf3e93001 + checksum = 0x4528a6ac # # $FreeBSD$ # diff --git a/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt b/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt index 3c05e356c677..14c3065feef4 100644 --- a/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt +++ b/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt @@ -81,54 +81,50 @@ # PFs 0-3. These get 8 MSI/8 MSI-X vectors each. VFs are supported by # these 4 PFs only. [function "0"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x1 [function "1"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x2 [function "2"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x4 [function "3"] - nvf = 4 wx_caps = all r_caps = all - nvi = 2 - rssnvi = 2 - niqflint = 4 - nethctrl = 4 - neq = 8 - nexactf = 4 + nvi = 1 + rssnvi = 0 + niqflint = 2 + nethctrl = 2 + neq = 4 + nexactf = 2 cmask = all pmask = 0x8 @@ -138,7 +134,7 @@ wx_caps = all r_caps = all nvi = 32 - rssnvi = 8 + rssnvi = 32 niqflint = 512 nethctrl = 1024 neq = 2048 @@ -195,7 +191,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -207,7 +203,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -219,7 +215,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -231,7 +227,7 @@ wx_caps = 0x82 r_caps = 0x86 nvi = 1 - rssnvi = 1 + rssnvi = 0 niqflint = 2 nethctrl = 2 neq = 4 @@ -259,7 +255,7 @@ [fini] version = 0x1 - checksum = 0xb577311e + checksum = 0x5e0e0eb7 # # $FreeBSD$ # From 450a0ca4e60a5d6bd30a1a058d75bbd30f8109b6 Mon Sep 17 00:00:00 2001 From: ian Date: Mon, 25 Feb 2019 16:40:10 +0000 Subject: [PATCH 08/16] Add a metadata entry for the AT45DB641E chip. This chip has the same 3-byte jedec ID as its older cousin the AT45DB642D, but uses a different page size. The only way to distinguish between the two chips is that the 2D chip has 0 bytes of extended ID info and the new 1E has 1 byte of extended ID. The actual value of the extended ID byte is all zeroes. In other words, it's the presence of the extended info that identifies this chip. (Presumably a future upgrade might define non-zero values for the extended ID byte.) --- sys/dev/flash/at45d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 91a4da1074b4..06c558538626 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -157,6 +157,7 @@ static const struct at45d_flash_ident at45d_flash_devices[] = { { "AT45DB161x", 0x1f260000, 0x0000, 0x0000, 4096, 10, 528, 512 }, { "AT45DB321x", 0x1f270000, 0x0000, 0x0000, 8192, 10, 528, 0 }, { "AT45DB321x", 0x1f270100, 0x0000, 0x0000, 8192, 10, 528, 512 }, + { "AT45DB641E", 0x1f280001, 0x0000, 0xff00, 32768, 9, 264, 256 }, { "AT45DB642x", 0x1f280000, 0x0000, 0x0000, 8192, 11, 1056, 1024 }, }; From d5e105e7877a052bdc0cf166d988f62f897b78aa Mon Sep 17 00:00:00 2001 From: ian Date: Mon, 25 Feb 2019 17:30:01 +0000 Subject: [PATCH 09/16] Resolve a name conflict when both SpiFlash and DataFlash devices are present. Both SpiFlash (mx25l) and DataFlash (at45d) drivers create a disk device with a name of /dev/flash/spiN where N is the driver's unit number. If both types of devices are present in the same system, this creates a fatal conflict that prevents attachment of whichever device attaches second (because mx25l0 and at45d0 both try to create a spi0). This gives each type of device a unique name (mx25lN or at45dN respectively) and also adds an alias of spiN for compatibility. When both device types appear in the same system, only the first to attach gets the spiN alias. When the second device attaches there is a non-fatal warning that the alias can't be created, but both devices are still accessible via their primary names (and there is no need for the spiN name to work for backwards compatibility on such a system, because it has never been possible to use the spiN names when both devices exist). --- sys/dev/flash/at45d.c | 3 ++- sys/dev/flash/mx25l.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 06c558538626..92923164b134 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -338,13 +338,14 @@ at45d_delayed_attach(void *xsc) sc->disk->d_open = at45d_open; sc->disk->d_close = at45d_close; sc->disk->d_strategy = at45d_strategy; - sc->disk->d_name = "flash/spi"; + sc->disk->d_name = "flash/at45d"; sc->disk->d_drv1 = sc; sc->disk->d_maxsize = DFLTPHYS; sc->disk->d_sectorsize = pagesize; sc->disk->d_mediasize = pagesize * ident->pagecount; sc->disk->d_unit = device_get_unit(sc->dev); disk_create(sc->disk, DISK_VERSION); + disk_add_alias(sc->sc_disk, "flash/spi"); bioq_init(&sc->bio_queue); kproc_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash"); sc->taskstate = TSTATE_RUNNING; diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c index 6110c4082635..2b98619de0e9 100644 --- a/sys/dev/flash/mx25l.c +++ b/sys/dev/flash/mx25l.c @@ -510,7 +510,7 @@ mx25l_attach(device_t dev) sc->sc_disk->d_strategy = mx25l_strategy; sc->sc_disk->d_getattr = mx25l_getattr; sc->sc_disk->d_ioctl = mx25l_ioctl; - sc->sc_disk->d_name = "flash/spi"; + sc->sc_disk->d_name = "flash/mx25l"; sc->sc_disk->d_drv1 = sc; sc->sc_disk->d_maxsize = DFLTPHYS; sc->sc_disk->d_sectorsize = MX25L_SECTORSIZE; @@ -522,6 +522,7 @@ mx25l_attach(device_t dev) sizeof(sc->sc_disk->d_descr)); disk_create(sc->sc_disk, DISK_VERSION); + disk_add_alias(sc->sc_disk, "flash/spi"); bioq_init(&sc->sc_bio_queue); kproc_create(&mx25l_task, sc, &sc->sc_p, 0, 0, "task: mx25l flash"); From 10e5aeb6eb5aee6f5e68c10e693364fbe36efb48 Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 25 Feb 2019 17:40:00 +0000 Subject: [PATCH 10/16] arm64: rockchip: clk: Set the write mask when setting the clock mux RockChip clocks have a write mask in the upper 16bits of the mux register which wasn't set in the set_mux function. Also the wrong parent was tested instead of the real current one, when switch parent, test with the current one before. Pointy Hat: manu MFC after: 1 week --- sys/arm64/rockchip/clk/rk_clk_composite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/arm64/rockchip/clk/rk_clk_composite.c index bc550a8e766e..1f64dacdeec2 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.c +++ b/sys/arm64/rockchip/clk/rk_clk_composite.c @@ -128,7 +128,7 @@ rk_clk_composite_set_mux(struct clknode *clk, int index) READ4(clk, sc->muxdiv_offset, &val); val &= ~sc->mux_mask; val |= index << sc->mux_shift; - WRITE4(clk, sc->muxdiv_offset, val); + WRITE4(clk, sc->muxdiv_offset, val | RK_CLK_COMPOSITE_MASK); DEVICE_UNLOCK(clk); return (0); @@ -222,6 +222,7 @@ rk_clk_composite_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, return (0); } + p_idx = clknode_get_parent_idx(clk); if (p_idx != best_parent) clknode_set_parent_by_idx(clk, best_parent); From 22e5a596e4a072761bf35dbe44e4c974c21d9ccd Mon Sep 17 00:00:00 2001 From: ian Date: Mon, 25 Feb 2019 18:11:59 +0000 Subject: [PATCH 11/16] Fix a paste-o that broke the build on all arches. Reported by: many Pointy hat: ian@ --- sys/dev/flash/at45d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 92923164b134..8a948dc4e189 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -345,7 +345,7 @@ at45d_delayed_attach(void *xsc) sc->disk->d_mediasize = pagesize * ident->pagecount; sc->disk->d_unit = device_get_unit(sc->dev); disk_create(sc->disk, DISK_VERSION); - disk_add_alias(sc->sc_disk, "flash/spi"); + disk_add_alias(sc->disk, "flash/spi"); bioq_init(&sc->bio_queue); kproc_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash"); sc->taskstate = TSTATE_RUNNING; From 6ff1d0e3174b3c7d39f3def7bbb5e7a3ef53e41d Mon Sep 17 00:00:00 2001 From: emaste Date: Mon, 25 Feb 2019 18:22:20 +0000 Subject: [PATCH 12/16] Make libifconfig INTERNALLIB Instead of PRIVATELIB + NO_PIC. This avoids the need for the wlandebug PIE special case added in r344211, and provides a stronger guarantee against 3rd party software coming to depend on the API or ABI. If / when we declare the API/ABI to be stable we can make it a normal library. Discussed with: bapt Sponsored by: The FreeBSD Foundation --- ObsoleteFiles.inc | 3 +++ lib/libifconfig/Makefile | 4 +--- share/mk/bsd.libnames.mk | 1 - share/mk/src.libnames.mk | 5 ++++- sys/sys/capability.h | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1cdb447200a3..39eba5af6d4c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20190222: libifconfig made INTERNALLIB +OLD_FILES+=/usr/lib/libprivateifconfig.a +OLD_FILES+=/usr/lib/libprivateifconfig_p.a # 20190131: pfil(9) changed OLD_FILES+=usr/share/man/man9/pfil_hook_get.9 OLD_FILES+=usr/share/man/man9/pfil_rlock.9 diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile index 94bd3ac5eb86..9ec235a076c4 100644 --- a/lib/libifconfig/Makefile +++ b/lib/libifconfig/Makefile @@ -2,9 +2,7 @@ PACKAGE= lib${LIB} LIB= ifconfig -PRIVATELIB= true -# Don't build shared library, for now. -NO_PIC= +INTERNALLIB= true SHLIBDIR?= /lib SHLIB_MAJOR= 1 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index bb6861ba74fc..b2675fce7cf3 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -80,7 +80,6 @@ LIBIBMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a LIBIBNETDISC?= ${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc.a LIBIBUMAD?= ${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a LIBIBVERBS?= ${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a -LIBIFCONFIG?= ${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a LIBIPSEC?= ${LIBDESTDIR}${LIBDIR_BASE}/libipsec.a LIBIPT?= ${LIBDESTDIR}${LIBDIR_BASE}/libipt.a LIBJAIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libjail.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index daf420fb377a..99ae9f7114e2 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -20,7 +20,6 @@ _PRIVATELIBS= \ event \ heimipcc \ heimipcs \ - ifconfig \ ldns \ sqlite3 \ ssh \ @@ -35,6 +34,7 @@ _INTERNALLIBS= \ cron \ elftc \ fifolog \ + ifconfig \ ipf \ lpr \ netbsd \ @@ -450,6 +450,9 @@ LIBVERS?= ${LIBVERSDIR}/libvers${PIE_SUFFIX}.a LIBSLDIR= ${OBJTOP}/kerberos5/lib/libsl LIBSL?= ${LIBSLDIR}/libsl${PIE_SUFFIX}.a +LIBIFCONFIGDIR= ${OBJTOP}/lib/libifconfig +LIBIFCONFIG?= ${LIBIFCONFIGDIR}/libifconfig${PIE_SUFFIX}.a + LIBIPFDIR= ${OBJTOP}/sbin/ipf/libipf LIBIPF?= ${LIBIPFDIR}/libipf${PIE_SUFFIX}.a diff --git a/sys/sys/capability.h b/sys/sys/capability.h index 39195e034c56..6c3bae746dbb 100644 --- a/sys/sys/capability.h +++ b/sys/sys/capability.h @@ -35,13 +35,13 @@ * Historically, the key userspace and kernel Capsicum definitions were found * in this file. However, it conflicted with POSIX.1e's capability.h, so has * been renamed capsicum.h. The file remains for backwards compatibility - * reasons as a nested include. It is expected to be removed before - * FreeBSD 13. + * reasons as a nested include. It will be removed on March 31, 2019 and will + * not be in FreeBSD 13. */ #ifndef _SYS_CAPABILITY_H_ #define _SYS_CAPABILITY_H_ -#warning this file includes which is deprecated +#warning this file includes , to be removed on March 31, 2019. #include #endif /* !_SYS_CAPABILITY_H_ */ From c0daa6fba9c57e41427c5b0f9d39a63c2879c874 Mon Sep 17 00:00:00 2001 From: emaste Date: Mon, 25 Feb 2019 18:25:53 +0000 Subject: [PATCH 13/16] Remove unintend change to capability.h from r344530 I expect to remove capability.h in the near future, but it should not have been part of this commit. --- sys/sys/capability.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/capability.h b/sys/sys/capability.h index 6c3bae746dbb..39195e034c56 100644 --- a/sys/sys/capability.h +++ b/sys/sys/capability.h @@ -35,13 +35,13 @@ * Historically, the key userspace and kernel Capsicum definitions were found * in this file. However, it conflicted with POSIX.1e's capability.h, so has * been renamed capsicum.h. The file remains for backwards compatibility - * reasons as a nested include. It will be removed on March 31, 2019 and will - * not be in FreeBSD 13. + * reasons as a nested include. It is expected to be removed before + * FreeBSD 13. */ #ifndef _SYS_CAPABILITY_H_ #define _SYS_CAPABILITY_H_ -#warning this file includes , to be removed on March 31, 2019. +#warning this file includes which is deprecated #include #endif /* !_SYS_CAPABILITY_H_ */ From 1a4d696572a2a0ad8af24ac4350ba8d2d2de391d Mon Sep 17 00:00:00 2001 From: emaste Date: Mon, 25 Feb 2019 18:27:19 +0000 Subject: [PATCH 14/16] Revert r344211: wlandebug: disable PIE to fix build failure As of r344530 libifconfig is built as a standard INTERNALLIB and the wlandebug PIE workaround from r344211 can be removed. --- usr.sbin/wlandebug/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/wlandebug/Makefile b/usr.sbin/wlandebug/Makefile index 8f3455f2ebac..7ac993319947 100644 --- a/usr.sbin/wlandebug/Makefile +++ b/usr.sbin/wlandebug/Makefile @@ -2,7 +2,6 @@ PROG= wlandebug MAN= wlandebug.8 -MK_PIE:= no LIBADD+= ifconfig From 724199fd4be1d5274c9fabdfb9bb84778cf8de41 Mon Sep 17 00:00:00 2001 From: luporl Date: Mon, 25 Feb 2019 18:52:47 +0000 Subject: [PATCH 15/16] Increase ctfconvert buffer size Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D19353 --- cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index 8f8bcda82237..32c993e1e524 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -1268,7 +1268,7 @@ die_funcptr_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp) static intr_t * die_base_name_parse(const char *name, char **newp) { - char buf[100]; + char buf[256]; char const *base; char *c; int nlong = 0, nshort = 0, nchar = 0, nint = 0; From 7f9195f715b426ce06790eceeffb82fb52ab5b52 Mon Sep 17 00:00:00 2001 From: sef Date: Mon, 25 Feb 2019 19:14:16 +0000 Subject: [PATCH 16/16] Fix another bug introduced during the review process of r344140: the tag wasn't being computed properly due to chaning a >= comparison to an == comparison. Specifically: CBC-MAC encodes the length of the authorization data into the the stream to be encrypted/hashed. For short data, this is two bytes (big-endian 16 bit value); for larger data, it's 6 bytes (a prefix of 0xff, 0xfe, followed by a 32-bit big-endian length). And there's a larger size, which is 10 bytes. These extra bytes weren't being accounted for with the post-review code. The other bit that then came into play was that OCF only calls the Update code with blksiz=16, which meant that I had to ignore the length variable. (It also means that it can't be called with a single buffer containing the AAD and payload; however, OCF doesn't do this for the software-only algorithsm.) I tested with this script: ALG=aes-ccm DEV=soft for aad in 0 1 2 3 4 14 16 24 30 32 34 36 1020 do for dln in 16 32 1024 2048 10240 do echo "Testing AAD length ${aad} data length ${dln}" /root/cryptocheck -A ${aad} -a ${ALG} -d ${DEV} ${dln} done done Reviewed by: cem Sponsored by: iXsystems Inc. --- sys/opencrypto/cbc_mac.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/opencrypto/cbc_mac.c b/sys/opencrypto/cbc_mac.c index bd7f9cb00d79..647d81e5a106 100644 --- a/sys/opencrypto/cbc_mac.c +++ b/sys/opencrypto/cbc_mac.c @@ -124,23 +124,31 @@ AES_CBC_MAC_Reinit(struct aes_cbc_mac_ctx *ctx, const uint8_t *nonce, uint16_t n rijndaelEncrypt(ctx->keysched, ctx->rounds, b0, ctx->block); /* If there is auth data, we need to set up the staging block */ if (ctx->authDataLength) { + size_t addLength; if (ctx->authDataLength < ((1<<16) - (1<<8))) { uint16_t sizeVal = htobe16(ctx->authDataLength); bcopy(&sizeVal, ctx->staging_block, sizeof(sizeVal)); - ctx->blockIndex = sizeof(sizeVal); + addLength = sizeof(sizeVal); } else if (ctx->authDataLength < (1ULL<<32)) { uint32_t sizeVal = htobe32(ctx->authDataLength); ctx->staging_block[0] = 0xff; ctx->staging_block[1] = 0xfe; bcopy(&sizeVal, ctx->staging_block+2, sizeof(sizeVal)); - ctx->blockIndex = 2 + sizeof(sizeVal); + addLength = 2 + sizeof(sizeVal); } else { uint64_t sizeVal = htobe64(ctx->authDataLength); ctx->staging_block[0] = 0xff; ctx->staging_block[1] = 0xff; bcopy(&sizeVal, ctx->staging_block+2, sizeof(sizeVal)); - ctx->blockIndex = 2 + sizeof(sizeVal); + addLength = 2 + sizeof(sizeVal); } + ctx->blockIndex = addLength; + /* + * The length descriptor goes into the AAD buffer, so we + * need to account for it. + */ + ctx->authDataLength += addLength; + ctx->authDataCount = addLength; } } @@ -181,10 +189,9 @@ AES_CBC_MAC_Update(struct aes_cbc_mac_ctx *ctx, const uint8_t *data, ctx->authDataCount += copy_amt; ctx->blockIndex += copy_amt; ctx->blockIndex %= sizeof(ctx->staging_block); - if (ctx->authDataCount == ctx->authDataLength) - length = 0; + if (ctx->blockIndex == 0 || - ctx->authDataCount >= ctx->authDataLength) { + ctx->authDataCount == ctx->authDataLength) { /* * We're done with this block, so we * xor staging_block with block, and then @@ -193,8 +200,17 @@ AES_CBC_MAC_Update(struct aes_cbc_mac_ctx *ctx, const uint8_t *data, xor_and_encrypt(ctx, ctx->staging_block, ctx->block); bzero(ctx->staging_block, sizeof(ctx->staging_block)); ctx->blockIndex = 0; + if (ctx->authDataCount >= ctx->authDataLength) + break; } } + /* + * We'd like to be able to check length == 0 and return + * here, but the way OCF calls us, length is always + * blksize (16, in this case). So we have to count on + * the fact that OCF calls us separately for the AAD and + * for the real data. + */ return (0); } /*