summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.in31
-rw-r--r--lib/libpam/Makefile.in306
-rw-r--r--lib/libpam/pam_getenv.c21
3 files changed, 264 insertions, 94 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ed2ff0f44813d..1ff96b17ad480 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 c6e4b44f55c25..1165a32f134df 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 c3bbcd8eac2f0..c207f5cfe470b 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);
}
/**