Switch to clang code coverage.

.gitignore

@@ -0,0 +1,30 @@
+/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

Makefile.am

@@ -1,5 +1,3 @@
-# $OpenPAM$
-
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = misc include lib bin modules

autogen.des

@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $OpenPAM$
-#
 
 set -ex
 
@@ -10,19 +7,6 @@ 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 \
@@ -31,4 +15,5 @@ fi
 	--enable-debug \
 	--enable-developer-warnings \
 	--enable-werror \
+	--enable-code-coverage \
 	"$@"

autogen.sh

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

bin/Makefile.am

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

bin/openpam_dump_policy/.gitignore

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

bin/openpam_dump_policy/Makefile.am

@@ -1,5 +1,3 @@
-# $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,8 +25,6 @@
  * 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

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

bin/pamtest/Makefile.am

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

bin/pamtest/pamtest.1

@@ -26,8 +26,6 @@
 .\" 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,8 +25,6 @@
  * 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

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

bin/su/Makefile.am

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

bin/su/su.1

@@ -26,8 +26,6 @@
 .\" 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,8 +31,6 @@
  * 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,8 +1,5 @@
-dnl $OpenPAM$
-
-AC_PREREQ([2.62])
-AC_REVISION([$OpenPAM$])
-AC_INIT([OpenPAM], [trunk], [des@des.no], [openpam], [http://www.openpam.org/])
+AC_PREREQ([2.69])
+AC_INIT([OpenPAM], [trunk], [des@des.no], [openpam], [https://openpam.org/])
 AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -10,13 +7,15 @@ AM_CONFIG_HEADER([config.h])
 
 # C compiler and features
 AC_LANG(C)
-AC_PROG_CC
+AC_PROG_CC([clang gcc 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])
@@ -125,6 +124,21 @@ 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]))
+AM_CONDITIONAL([CODE_COVERAGE], [test x"$enable_code_coverage" = x"yes"])
+AS_IF([test x"$enable_code_coverage" = x"yes"], [
+    AS_IF([test x"$ax_cv_c_compiler_vendor" = x"clang"], [
+        CFLAGS="${CFLAGS} -fprofile-instr-generate -fcoverage-mapping"
+    ], [
+        AC_MSG_ERROR([code coverage is only supported with clang])
+    ])
+    AC_DEFINE([CODE_COVERAGE], [1], [Define to 1 if code coverage is enabled])
+    AC_MSG_NOTICE([code coverage enabled])
+])
+AC_SUBST([enable_code_coverage], [$enable_code_coverage])
+
 AC_CONFIG_FILES([
     Makefile
     bin/Makefile
@@ -133,6 +147,7 @@ AC_CONFIG_FILES([
     bin/su/Makefile
     doc/Makefile
     doc/man/Makefile
+    freebsd/Makefile
     include/Makefile
     include/security/Makefile
     lib/Makefile
@@ -145,7 +160,6 @@ 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,3 +1 @@
-# $OpenPAM$
-
 SUBDIRS = man

doc/man/.gitignore

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

doc/man/Makefile.am

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

doc/man/openpam.man

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

doc/man/pam.conf.5

@@ -26,8 +26,6 @@
 .\" 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,6 +1,3 @@
-.\"
-.\" $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,8 +32,6 @@
 .\" 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,5 +1,3 @@
-$OpenPAM$
-
 Errata in XSSO, chapter 5:
 
 p. 25:	the first member of struct pam_response is named "resp", not

freebsd/.gitignore

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

freebsd/Makefile.in

@@ -0,0 +1,33 @@
+# $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,3 +1 @@
-# $OpenPAM$
-
 SUBDIRS = security

include/security/Makefile.am

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

include/security/openpam.h

@@ -31,8 +31,6 @@
  * 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,7 +1,3 @@
-/*
- * $OpenPAM$
- */
-
 #ifndef SECURITY_OPENPAM_ATTR_H_INCLUDED
 #define SECURITY_OPENPAM_ATTR_H_INCLUDED
 

include/security/openpam_version.h

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

include/security/pam_appl.h

@@ -31,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,5 +1,3 @@
-# $OpenPAM$
-
 SUBDIRS =
 
 if !WITH_SYSTEM_LIBPAM

lib/libpam/Makefile.am

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

lib/libpam/openpam_asprintf.c

@@ -25,8 +25,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +25,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +23,6 @@
  * 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,8 +25,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +31,6 @@
  * 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,8 +25,6 @@
  * 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_readword.c

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

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

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

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

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

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

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