.gitignore

@@ -1,30 +0,0 @@
-/aclocal.m4
-/autom4te.cache
-/compile
-/config.guess
-/config.h.in
-/config.h
-/config.log
-/config.status
-/config.sub
-/configure
-/cov
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/stamp-h1
-/test-driver
-*~
-.deps
-.libs
-*.a
-*.la
-*.lo
-*.log
-*.o
-*.pc
-*.profraw
-Makefile
-Makefile.in

CREDITS

@@ -45,7 +45,6 @@ ideas:
 	Mikko Työläjärvi <mbsd@pacbell.net>
 	Nick Hibma <nick@van-laarhoven.org>
 	Patrick Bihan-Faou <patrick-fbsd@mindstep.com>
-	Robert Morris <rtm@lcs.mit.edu>
 	Robert Watson <rwatson@freebsd.org>
 	Ruslan Ermilov <ru@freebsd.org>
 	Sebastian Krahmer <sebastian.krahmer@gmail.com>

HISTORY

@@ -1,13 +1,7 @@
-OpenPAM Ximenia							2023-06-27
+OpenPAM ???							2020-07-??
 
  - BUGFIX: Fix race condition in openpam_ttyconv(3) when used with
    expect scripts.
-
- - BUGFIX: In openpam_set_option(3), when removing an option, properly
-   decrement the option count.
-
- - BUGFIX: In openpam_subst(3), avoid incrementing past the end of the
-   template.
 ============================================================================
 OpenPAM Tabebuia						2019-02-24
 

LICENSE

@@ -1,6 +1,6 @@
 
 Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-Copyright (c) 2004-2023 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

Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = misc include lib bin modules
@@ -17,32 +19,3 @@ EXTRA_DIST = \
 	RELNOTES \
 	autogen.sh \
 	misc/gendoc.pl
-
-if WITH_CODE_COVERAGE
-covdir = @abs_top_builddir@/cov
-coverage: coverage-clean all coverage-prepare coverage-run coverage-report
-coverage-clean:
-	-rm -rf "${covdir}"
-coverage-prepare:
-	mkdir "${covdir}"
-if CLANG_CODE_COVERAGE
-profdata = ${covdir}/@PACKAGE@.profdata
-# hardcoding libpam.so here is horrible, need to find a better solution
-coverage-run:
-	LLVM_PROFILE_FILE="${covdir}/@PACKAGE@.%p.raw" \
-	    ${MAKE} -C "@abs_top_builddir@" check
-coverage-report:
-	llvm-profdata@clang_ver@ merge \
-	    --sparse "${covdir}/@PACKAGE@".*.raw -o "${profdata}"
-	llvm-cov@clang_ver@ show \
-	    --format=html --tab-size=8 \
-	    --output-dir="${covdir}" \
-	    --instr-profile="${profdata}" \
-	    --object "@abs_top_builddir@/lib/libpam/.libs/libpam.so"
-	@echo "coverage report: file://${covdir}/index.html"
-endif
-else
-coverage:
-	echo "code coverage is not enabled." >&2
-	false
-endif

RELNOTES

@@ -1,6 +1,6 @@
 
-		  Release notes for OpenPAM Ximenia
-		  =================================
+		  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

autogen.des

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $OpenPAM$
+#
 
 set -ex
 
@@ -7,6 +10,19 @@ set -ex
 # autoconf prior to 2.62 has issues with zsh 4.2 and newer
 export CONFIG_SHELL=/bin/sh
 
+# BullseyeCoverage needs to know exactly which compiler we're using
+if [ -z "$CC" -a -z "$CPP" -a -z "$CXX" ] ; then
+	if $(which clang clang++ >/dev/null) ; then
+		export CC=${CC:-clang}
+		export CPP=${CPP:-clang -E}
+		export CXX=${CXX:-clang++}
+	elif $(which gcc g++ >/dev/null) ; then
+		export CC=${CC:-gcc}
+		export CPP=${CPP:-gcc -E}
+		export CXX=${CXX:-g++}
+	fi
+fi
+
 ./configure \
 	--with-doc \
 	--with-pam-unix \
@@ -15,5 +31,4 @@ export CONFIG_SHELL=/bin/sh
 	--enable-debug \
 	--enable-developer-warnings \
 	--enable-werror \
-	--enable-code-coverage \
 	"$@"

autogen.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $OpenPAM$
+#
 
 libtoolize --copy --force
 aclocal -I m4

bin/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 SUBDIRS = openpam_dump_policy
 
 if WITH_PAMTEST

bin/openpam_dump_policy/.gitignore

@@ -1 +0,0 @@
-/openpam_dump_policy

bin/openpam_dump_policy/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 
 noinst_PROGRAMS = openpam_dump_policy

bin/openpam_dump_policy/openpam_dump_policy.c

@@ -25,6 +25,8 @@
  * 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

bin/pamtest/.gitignore

@@ -1 +0,0 @@
-/pamtest

bin/pamtest/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = pamtest

bin/pamtest/pamtest.1

@@ -26,6 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $OpenPAM$
+.\"
 .Dd July 11, 2013
 .Dt PAMTEST 1
 .Os

bin/pamtest/pamtest.c

@@ -25,6 +25,8 @@
  * 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

bin/su/.gitignore

@@ -1 +0,0 @@
-/su

bin/su/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = su

bin/su/su.1

@@ -26,6 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $OpenPAM$
+.\"
 .Dd November 2, 2011
 .Dt SU 1
 .Os

bin/su/su.c

@@ -31,6 +31,8 @@
  * 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

configure.ac

@@ -1,5 +1,8 @@
-AC_PREREQ([2.69])
-AC_INIT([OpenPAM], [trunk], [des@des.no], [openpam], [https://openpam.org/])
+dnl $OpenPAM$
+
+AC_PREREQ([2.62])
+AC_REVISION([$OpenPAM$])
+AC_INIT([OpenPAM], [trunk], [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])
@@ -7,15 +10,13 @@ AM_CONFIG_HEADER([config.h])
 
 # C compiler and features
 AC_LANG(C)
-AC_PROG_CC([clang gcc cc])
+AC_PROG_CC
 AC_PROG_CC_STDC
 AC_PROG_CPP
-AC_PROG_CXX([clang++ g++ c++])
 AC_GNU_SOURCE
 AC_C_CONST
 AC_C_RESTRICT
 AC_C_VOLATILE
-AX_COMPILER_VENDOR
 
 # libtool
 LT_PREREQ([2.2.6])
@@ -33,26 +34,26 @@ AC_DEFINE_UNQUOTED(LIB_MAJ, $LIB_MAJ, [OpenPAM library major number])
 
 AC_ARG_ENABLE([debug],
     AC_HELP_STRING([--enable-debug],
-        [turn debugging macros on]),
+	[turn debugging macros on]),
     AC_DEFINE(OPENPAM_DEBUG, 1, [Turn debugging macros on]))
 
 AC_ARG_ENABLE([unversioned-modules],
     AC_HELP_STRING([--disable-unversioned-modules],
-        [support loading of unversioned modules]),
+	[support loading of unversioned modules]),
     [AS_IF([test x"$enableval" = x"no"], [
-        AC_DEFINE(DISABLE_UNVERSIONED_MODULES,
-            1,
-            [Whether loading unversioned modules support is disabled])
+	AC_DEFINE(DISABLE_UNVERSIONED_MODULES,
+	    1,
+	    [Whether loading unversioned modules support is disabled])
     ])])
 
 AC_ARG_WITH([modules-dir],
     AC_HELP_STRING([--with-modules-dir=DIR],
-        [OpenPAM modules directory]),
+	[OpenPAM modules directory]),
     [AS_IF([test x"$withval" != x"no"], [
-        OPENPAM_MODULES_DIR="$withval"
-        AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
-            "${OPENPAM_MODULES_DIR%/}",
-            [OpenPAM modules directory])
+	OPENPAM_MODULES_DIR="$withval"
+	AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR, 
+	    "${OPENPAM_MODULES_DIR%/}",
+	    [OpenPAM modules directory])
     ])])
 AC_SUBST(OPENPAM_MODULES_DIR)
 AM_CONDITIONAL([CUSTOM_MODULES_DIR], [test x"$OPENPAM_MODULES_DIR" != x""])
@@ -124,27 +125,6 @@ AC_ARG_ENABLE([werror],
     AS_HELP_STRING([--enable-werror], [use -Werror (default is NO)]),
     [CFLAGS="${CFLAGS} -Werror"])
 
-AC_ARG_ENABLE([code-coverage],
-    AS_HELP_STRING([--enable-code-coverage],
-        [enable code coverage]))
-AS_IF([test x"$enable_code_coverage" = x"yes"], [
-    AM_COND_IF([WITH_TEST], [
-        AS_IF([test x"$ax_cv_c_compiler_vendor" = x"clang"], [
-            CFLAGS="${CFLAGS} -fprofile-instr-generate -fcoverage-mapping"
-            clang_code_coverage="yes"
-	    AC_SUBST([clang_ver], [${CC#clang}])
-        ], [
-            AC_MSG_ERROR([code coverage is only supported with clang])
-        ])
-        AC_DEFINE([WITH_CODE_COVERAGE], [1], [Define to 1 if code coverage is enabled])
-        AC_MSG_NOTICE([code coverage enabled])
-    ], [
-        AC_MSG_ERROR([code coverage requires unit tests])
-    ])
-])
-AM_CONDITIONAL([WITH_CODE_COVERAGE], [test x"$enable_code_coverage" = x"yes"])
-AM_CONDITIONAL([CLANG_CODE_COVERAGE], [test x"$clang_code_coverage" = x"yes"])
-
 AC_CONFIG_FILES([
     Makefile
     bin/Makefile
@@ -153,7 +133,6 @@ AC_CONFIG_FILES([
     bin/su/Makefile
     doc/Makefile
     doc/man/Makefile
-    freebsd/Makefile
     include/Makefile
     include/security/Makefile
     lib/Makefile
@@ -166,5 +145,7 @@ AC_CONFIG_FILES([
     modules/pam_unix/Makefile
     t/Makefile
 ])
+AC_CONFIG_FILES([mkpkgng],[chmod +x mkpkgng])
+AC_CONFIG_FILES([misc/coverage.sh],[chmod +x misc/coverage.sh])
 AC_CONFIG_FILES([misc/coverity.sh],[chmod +x misc/coverity.sh])
 AC_OUTPUT

doc/Makefile.am

@@ -1 +1,3 @@
+# $OpenPAM$
+
 SUBDIRS = man

doc/man/.gitignore

@@ -1,2 +0,0 @@
-/*.3
-!/pam_conv.3

doc/man/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 NULL =
 
 # Standard PAM API

doc/man/openpam.man

@@ -1,3 +1,6 @@
+.\"
+.\" $OpenPAM$
+.\"
 .Sh DESCRIPTION
 These functions are OpenPAM extensions to the PAM API.
 Those named

doc/man/pam.conf.5

@@ -26,6 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $OpenPAM$
+.\"
 .Dd March 17, 2013
 .Dt PAM.CONF 5
 .Os

doc/man/pam.man

@@ -1,3 +1,6 @@
+.\"
+.\" $OpenPAM$
+.\"
 .Sh DESCRIPTION
 The Pluggable Authentication Modules (PAM) library abstracts a number
 of common authentication-related operations and provides a framework

doc/man/pam_conv.3

@@ -32,6 +32,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $OpenPAM$
+.\"
 .Dd June 16, 2005
 .Dt PAM_CONV 3
 .Os

doc/xsso_errata.txt

@@ -1,3 +1,5 @@
+$OpenPAM$
+
 Errata in XSSO, chapter 5:
 
 p. 25:	the first member of struct pam_response is named "resp", not

freebsd/.gitignore

@@ -1,2 +0,0 @@
-!/Makefile.in
-/work

freebsd/Makefile.in

@@ -1,33 +0,0 @@
-# $FreeBSD: portlint$
-
-PORTNAME=	@PACKAGE_TARNAME@
-PORTVERSION=	@PACKAGE_VERSION@
-CATEGORIES=	security devel
-MASTER_SITES=	#
-DISTFILES=	#
-
-MAINTAINER=	@PACKAGE_BUGREPORT@
-COMMENT=	BSD-licensed implementation of Pluggable Authentication Modules
-
-LICENSE=	BSD3CLAUSE
-
-USES=		gmake libtool pkgconfig
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
-
-DESCR=		${WRKDIR}/pkg-descr
-
-do-extract:
-	(cd @abs_top_srcdir@ && \
-	    ${GMAKE} distdir && ${MV} ${PKGNAME} ${WRKDIR})
-	(${CAT} ${WRKSRC}/README && ${ECHO} && \
-	    ${ECHO} "WWW: @PACKAGE_URL@") >${DESCR}
-
-post-stage:
-	(cd ${STAGEDIR} && \
-	    ${FIND} -s . -type f -or -type l | cut -c 2- | \
-	    ${SED} -E '/\/man\//s/([0-9])$$/\1.gz/') >>${TMPPLIST}
-
-.include <bsd.port.mk>

include/Makefile.am

@@ -1 +1,3 @@
+# $OpenPAM$
+
 SUBDIRS = security

include/security/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 securitydir = $(includedir)/security
 
 security_HEADERS = \

include/security/openpam.h

@@ -31,6 +31,8 @@
  * 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 SECURITY_OPENPAM_H_INCLUDED

include/security/openpam_attr.h

@@ -1,3 +1,7 @@
+/*
+ * $OpenPAM$
+ */
+
 #ifndef SECURITY_OPENPAM_ATTR_H_INCLUDED
 #define SECURITY_OPENPAM_ATTR_H_INCLUDED
 

include/security/openpam_version.h

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2023 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
@@ -31,13 +31,15 @@
  * 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 SECURITY_OPENPAM_VERSION_H_INCLUDED
 #define SECURITY_OPENPAM_VERSION_H_INCLUDED
 
 #define OPENPAM
-#define OPENPAM_VERSION	20230627
-#define OPENPAM_RELEASE	"Ximenia"
+#define OPENPAM_VERSION	20190224
+#define OPENPAM_RELEASE	"Tabebuia"
 
 #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */

include/security/pam_appl.h

@@ -31,6 +31,8 @@
  * 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 SECURITY_PAM_APPL_H_INCLUDED

include/security/pam_constants.h

@@ -31,6 +31,8 @@
  * 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 SECURITY_PAM_CONSTANTS_H_INCLUDED

include/security/pam_modules.h

@@ -31,6 +31,8 @@
  * 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 SECURITY_PAM_MODULES_H_INCLUDED

include/security/pam_types.h

@@ -31,6 +31,8 @@
  * 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 SECURITY_PAM_TYPES_H_INCLUDED

lib/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 SUBDIRS =
 
 if !WITH_SYSTEM_LIBPAM

lib/libpam/Makefile.am

@@ -1,3 +1,5 @@
+# $OpenPAM$
+
 NULL =
 
 AM_CPPFLAGS = -I$(top_srcdir)/include

lib/libpam/openpam_asprintf.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_asprintf.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_ASPRINTF_H_INCLUDED

lib/libpam/openpam_borrow_cred.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_check_owner_perms.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_configure.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_constants.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_constants.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_CONSTANTS_H_INCLUDED

lib/libpam/openpam_cred.h

@@ -31,6 +31,8 @@
  * 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 OPENPAM_CRED_H_INCLUDED

lib/libpam/openpam_ctype.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_CTYPE_H_INCLUDED

lib/libpam/openpam_debug.h

@@ -31,6 +31,8 @@
  * 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 OPENPAM_DEBUG_H_INCLUDED

lib/libpam/openpam_dispatch.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_dlfunc.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_DLFCN_H_INCLUDED

lib/libpam/openpam_dynamic.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_features.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_features.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_FEATURES_H_INCLUDED

lib/libpam/openpam_findenv.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_free_data.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_free_envlist.c

@@ -23,6 +23,8 @@
  * 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

lib/libpam/openpam_get_feature.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_get_option.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_impl.h

@@ -31,6 +31,8 @@
  * 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 OPENPAM_IMPL_H_INCLUDED

lib/libpam/openpam_load.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_log.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_nullconv.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_readline.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_readlinev.c

@@ -25,6 +25,8 @@
  * 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
@@ -57,6 +59,7 @@ openpam_readlinev(FILE *f, int *lineno, int *lenp)
 	wordvsize = MIN_WORDV_SIZE;
 	wordvlen = 0;
 	if ((wordv = malloc(wordvsize * sizeof *wordv)) == NULL) {
+		openpam_log(PAM_LOG_ERROR, "malloc(): %m");
 		errno = ENOMEM;
 		return (NULL);
 	}
@@ -67,6 +70,7 @@ openpam_readlinev(FILE *f, int *lineno, int *lenp)
 			wordvsize *= 2;
 			tmp = realloc(wordv, wordvsize * sizeof *wordv);
 			if (tmp == NULL) {
+				openpam_log(PAM_LOG_ERROR, "malloc(): %m");
 				errno = ENOMEM;
 				break;
 			}

lib/libpam/openpam_readword.c

@@ -25,6 +25,8 @@
  * 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
@@ -132,6 +134,7 @@ openpam_readword(FILE *f, int *lineno, size_t *lenp)
 	}
 	if (ch == EOF && (escape || quote)) {
 		/* Missing escaped character or closing quote. */
+		openpam_log(PAM_LOG_DEBUG, "unexpected end of file");
 		free(word);
 		errno = EINVAL;
 		return (NULL);

lib/libpam/openpam_restore_cred.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_set_feature.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_set_option.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2023 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2011 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,6 +31,8 @@
  * 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
@@ -83,7 +85,6 @@ openpam_set_option(pam_handle_t *pamh,
 		for (free(cur->optv[i]); i < cur->optc; ++i)
 			cur->optv[i] = cur->optv[i + 1];
 		cur->optv[i] = NULL;
-		--cur->optc;
 		RETURNC(PAM_SUCCESS);
 	}
 	if (asprintf(&opt, "%.*s=%s", (int)len, option, value) < 0)

lib/libpam/openpam_static.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_straddch.c

@@ -25,6 +25,8 @@
  * 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
@@ -56,6 +58,7 @@ openpam_straddch(char **str, size_t *size, size_t *len, int ch)
 		/* initial allocation */
 		tmpsize = MIN_STR_SIZE;
 		if ((tmpstr = malloc(tmpsize)) == NULL) {
+			openpam_log(PAM_LOG_ERROR, "malloc(): %m");
 			errno = ENOMEM;
 			return (-1);
 		}
@@ -66,6 +69,7 @@ openpam_straddch(char **str, size_t *size, size_t *len, int ch)
 		/* additional space required */
 		tmpsize = *size * 2;
 		if ((tmpstr = realloc(*str, tmpsize)) == NULL) {
+			openpam_log(PAM_LOG_ERROR, "realloc(): %m");
 			errno = ENOMEM;
 			return (-1);
 		}

lib/libpam/openpam_strlcat.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_strlcat.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_STRLCAT_H_INCLUDED

lib/libpam/openpam_strlcmp.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_STRLCMP_H_INCLUDED

lib/libpam/openpam_strlcpy.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_strlcpy.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_STRLCPY_H_INCLUDED

lib/libpam/openpam_strlset.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_strlset.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_STRLSET_H_INCLUDED

lib/libpam/openpam_subst.c

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011-2023 Dag-Erling Smørgrav
+ * Copyright (c) 2011 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,8 @@
  * 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
@@ -104,8 +106,7 @@ openpam_subst(const pam_handle_t *pamh,
 				subst_char('%');
 				subst_char(*template);
 			}
-			if (*template)
-				++template;
+			++template;
 		} else {
 			subst_char(*template++);
 		}

lib/libpam/openpam_ttyconv.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/openpam_vasprintf.c

@@ -25,6 +25,8 @@
  * 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

lib/libpam/openpam_vasprintf.h

@@ -25,6 +25,8 @@
  * 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 OPENPAM_VASPRINTF_H_INCLUDED

lib/libpam/pam_acct_mgmt.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_authenticate.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_authenticate_secondary.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_chauthtok.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_close_session.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_end.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_error.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_get_authtok.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_get_data.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_get_item.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_get_mapped_authtok.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_get_mapped_username.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_get_user.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_getenv.c

@@ -31,6 +31,8 @@
  * 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

lib/libpam/pam_getenvlist.c

@@ -31,6 +31,8 @@
  * 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