Remove stray references to OATH.

git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/branches/nooath@906 185d5e19-27fe-0310-9dcf-9bff6b9f3609

.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

@@ -18,7 +18,6 @@ ideas:
 	Ankita Pal <pal.ankita.ankita@gmail.com>
 	Baptiste Daroussin <bapt@freebsd.org>
 	Brian Fundakowski Feldman <green@freebsd.org>
-	Brooks Davis <brooks@freebsd.org>
 	Christos Zoulas <christos@netbsd.org>
 	Daniel Richard G. <skunk@iskunk.org>
 	Darren J. Moffat <darren.moffat@sun.com>
@@ -45,12 +44,10 @@ 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>
 	Solar Designer <solar@openwall.com>
 	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
-	Tim Creech <tcreech@tcreech.com>
 	Wojciech A. Koszek <wkoszek@freebsd.org>
 	Yar Tikhiy <yar@freebsd.org>

HISTORY

@@ -1,60 +1,3 @@
-OpenPAM Ximenia							2023-06-27
-
- - 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
-
- - 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
-   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
-   pam_get_user(3) from using application-provided custom prompts.
-
- - BUGFIX: Plug a memory leak in pam_set_item(3).
-
- - BUGFIX: Plug a potential memory leak in openpam_readlinev(3).
-
- - BUGFIX: In openpam_readword(3), support line continuations within
-   whitespace.
-
- - ENHANCE: Add a feature flag to control fallback to "other" policy.
-
- - ENHANCE: Add a pam_return(8) module which returns an arbitrary
-   code specified in the module options.
-
- - ENHANCE: More and better unit tests.
-============================================================================
 OpenPAM Ourouparia						2014-09-12
 
  - ENHANCE: When executing a chain, require at least one service

LICENSE

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

Makefile.am

@@ -1,6 +1,8 @@
+# $Id$
+
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = misc include lib bin modules
+SUBDIRS = lib bin modules include
 
 if WITH_DOC
 SUBDIRS += doc
@@ -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,21 +1,22 @@
 
-		  Release notes for OpenPAM Ximenia
-		  =================================
+                 Release notes for OpenPAM Ourouparia
+                 ====================================
 
-OpenPAM is developed primarily on FreeBSD, but is expected to work on
-almost any POSIX-like platform that has GNU autotools, GNU make and
-the GNU compiler suite installed.
+This release corresponds to the code used in FreeBSD HEAD as of the
+release date, and is also expected to work on almost any POSIX-like
+platform that has GNU autotools, GNU make and the GNU compiler suite
+installed.
 
-The OpenPAM distribution consists of the following components:
+The distribution consists of the following components:
 
  - The PAM library itself, with complete API documentation.
 
  - Sample modules (pam_permit, pam_deny and pam_unix) and a sample
-   application (su) which demonstrate how to use the PAM library.
+   application (su) which demonstrate how to use PAM.
 
  - A test application (pamtest) which can be used to test policies and
    modules.
 
- - Unit tests for limited portions of the library.
+ - Unit tests for limited portions of the libraries.
 
 Please direct bug reports and inquiries to <des@des.no>.

TODO

@@ -1,9 +1,15 @@
-- Fix try_first_pass / use_first_pass (pam_get_authtok() code &
-  documentation are slightly incorrect, OpenPAM's pam_unix(8) is
-  incorrect, all FreeBSD modules are broken)
+Before the next release:
 
-- Add loop detection to openpam_load_chain().
+ - Rewrite openpam_ttyconv(3).
+   - mostly done, needs review.
 
-- Complete unit tests for openpam_dispatch().
+ - Fix try_first_pass / use_first_pass (pam_get_authtok() code &
+   documentation are slightly incorrect, OpenPAM's pam_unix(8) is
+   incorrect, all FreeBSD modules are broken)
 
-- Stop using PAM_SYMBOL_ERR incorrectly.
+ - Add loop detection to openpam_load_chain().
+
+ - Look into the possibility of implementing a version of (or a
+   wrapper for) openpam_log() which respects the PAM_SILENT flag and
+   the no_warn module option.  This would eliminate the need for
+   FreeBSD's _pam_verbose_error().

autogen.des

@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $Id$
+#
 
 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
+#
+# $Id$
+#
 
 libtoolize --copy --force
 aclocal -I m4

bin/Makefile.am

@@ -1,3 +1,5 @@
+# $Id$
+
 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 @@
+# $Id$
+
 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

bin/pamtest/.gitignore

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

bin/pamtest/Makefile.am

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

bin/pamtest/pamtest.1

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2011-2017 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
@@ -26,6 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $Id$
+.\"
 .Dd July 11, 2013
 .Dt PAMTEST 1
 .Os
@@ -166,7 +168,7 @@ pamtest -v system auth account change setcred open close unsetcred
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .
 .Sh BUGS
 The
 .Nm

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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

bin/su/.gitignore

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

bin/su/Makefile.am

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

bin/su/su.1

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2011-2017 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
@@ -26,6 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $Id$
+.\"
 .Dd November 2, 2011
 .Dt SU 1
 .Os
@@ -60,4 +62,4 @@ and should not be used in production systems.
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .

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.
+ *
+ * $Id$
  */
 
 #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 $Id$
+
+AC_PREREQ([2.62])
+AC_REVISION([$Id$])
+AC_INIT([OpenPAM], [nooath], [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,23 +10,18 @@ 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])
 LT_INIT([disable-static dlopen])
 
-# pkg-config
-AX_PROG_PKG_CONFIG
-
 # other programs
 AC_PROG_INSTALL
 
@@ -33,26 +31,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""])
@@ -102,6 +100,20 @@ 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])
@@ -109,11 +121,6 @@ SYSTEM_LIBPAM="${LIBS}"
 LIBS="${saved_LIBS}"
 AC_SUBST(SYSTEM_LIBPAM)
 
-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)]),
     [CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual"])
@@ -124,27 +131,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,12 +139,10 @@ AC_CONFIG_FILES([
     bin/su/Makefile
     doc/Makefile
     doc/man/Makefile
-    freebsd/Makefile
     include/Makefile
     include/security/Makefile
     lib/Makefile
     lib/libpam/Makefile
-    misc/Makefile
     modules/Makefile
     modules/pam_deny/Makefile
     modules/pam_permit/Makefile
@@ -166,5 +150,5 @@ AC_CONFIG_FILES([
     modules/pam_unix/Makefile
     t/Makefile
 ])
-AC_CONFIG_FILES([misc/coverity.sh],[chmod +x misc/coverity.sh])
+AC_CONFIG_FILES([mkpkgng],[chmod +x mkpkgng])
 AC_OUTPUT

doc/Makefile.am

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

doc/man/.gitignore

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

doc/man/Makefile.am

@@ -1,7 +1,9 @@
+# $Id$
+
 NULL =
 
 # Standard PAM API
-PAM_MAN = \
+PMAN = \
 	pam_acct_mgmt.3 \
 	pam_authenticate.3 \
 	pam_chauthtok.3 \
@@ -22,7 +24,7 @@ PAM_MAN = \
 	$(NULL)
 
 # Standard module API
-MOD_MAN = \
+MMAN = \
 	pam_sm_acct_mgmt.3 \
 	pam_sm_authenticate.3 \
 	pam_sm_chauthtok.3 \
@@ -32,7 +34,7 @@ MOD_MAN = \
 	$(NULL)
 
 # OpenPAM extensions
-OPENPAM_MAN = \
+OMAN = \
 	openpam_borrow_cred.3 \
 	openpam_free_data.3 \
 	openpam_free_envlist.3 \
@@ -61,13 +63,8 @@ OPENPAM_MAN = \
 
 EXTRA_DIST = openpam.man pam.man
 
-if !WITH_SYSTEM_LIBPAM
-PAMCMAN = $(PAM_MAN) $(MOD_MAN) $(OPENPAM_MAN)
-PAMXMAN = openpam.3 pam.3
-endif
-
-ALLCMAN = $(PAMCMAN)
-GENMAN = $(ALLCMAN) $(PAMXMAN)
+ALLCMAN = $(PMAN) $(MMAN) $(OMAN)
+GENMAN = $(ALLCMAN) openpam.3 pam.3
 
 dist_man3_MANS = $(GENMAN) pam_conv.3
 
@@ -77,9 +74,9 @@ CLEANFILES = $(GENMAN)
 
 GENDOC = $(top_srcdir)/misc/gendoc.pl
 
-LIBPAMSRCDIR = $(top_srcdir)/lib/libpam
+LIBSRCDIR = $(top_srcdir)/lib/libpam
 
-VPATH = $(LIBPAMSRCDIR) $(srcdir)
+VPATH = $(LIBSRCDIR) $(srcdir)
 
 SUFFIXES = .3
 

doc/man/openpam.man

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

doc/man/pam.conf.5

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2005-2017 Dag-Erling Smørgrav
+.\" Copyright (c) 2005-2011 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $Id$
+.\"
 .Dd March 17, 2013
 .Dt PAM.CONF 5
 .Os
@@ -210,4 +212,4 @@ DARPA/SPAWAR contract N66001-01-C-8035
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
-.An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .

doc/man/pam.man

@@ -1,3 +1,6 @@
+.\"
+.\" $Id$
+.\"
 .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

@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-.\" Copyright (c) 2004-2017 Dag-Erling Smørgrav
+.\" Copyright (c) 2004-2014 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -32,6 +32,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $Id$
+.\"
 .Dd June 16, 2005
 .Dt PAM_CONV 3
 .Os
@@ -181,4 +183,4 @@ DARPA/SPAWAR contract N66001-01-C-8035
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
-.An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
+.An Dag-Erling Sm\(/orgrav Aq des@des.no .

doc/xsso_errata.txt

@@ -1,3 +1,5 @@
+$Id$
+
 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 @@
+# $Id$
+
 SUBDIRS = security

include/security/Makefile.am

@@ -1,3 +1,5 @@
+# $Id$
+
 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.
+ *
+ * $Id$
  */
 
 #ifndef SECURITY_OPENPAM_H_INCLUDED

include/security/openpam_attr.h

@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 #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-2014 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.
+ *
+ * $Id$
  */
 
 #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	20140912
+#define OPENPAM_RELEASE	"Ourouparia"
 
 #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */

include/security/pam_appl.h

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifndef SECURITY_PAM_APPL_H_INCLUDED

include/security/pam_constants.h

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
@@ -76,10 +78,6 @@ 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 */
 };
 

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifndef SECURITY_PAM_TYPES_H_INCLUDED

lib/Makefile.am

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

lib/libpam/Makefile.am

@@ -1,3 +1,5 @@
+# $Id$
+
 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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

lib/libpam/openpam_constants.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -42,126 +44,86 @@
 #include "openpam_impl.h"
 
 const char *pam_err_name[PAM_NUM_ERRORS] = {
-	[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",
+	"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"
 };
 
 const char *pam_item_name[PAM_NUM_ITEMS] = {
-	[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",
+	"(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",
 };
 
 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_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"
+	"pam_authenticate",
+	"pam_setcred",
+	"pam_acct_mgmt",
+	"pam_open_session",
+	"pam_close_session",
+	"pam_chauthtok"
 };
 
 const char *pam_sm_func_name[PAM_NUM_PRIMITIVES] = {
-	[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"
+	"pam_sm_authenticate",
+	"pam_sm_setcred",
+	"pam_sm_acct_mgmt",
+	"pam_sm_open_session",
+	"pam_sm_close_session",
+	"pam_sm_chauthtok"
 };
 
 const char *openpam_policy_path[] = {

lib/libpam/openpam_constants.h

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011-2017 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,13 +25,14 @@
  * 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.
+ *
+ * $Id$
  */
 
 #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];

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifndef OPENPAM_DEBUG_H_INCLUDED

lib/libpam/openpam_dispatch.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2015 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -67,6 +69,8 @@ openpam_dispatch(pam_handle_t *pamh,
 	int debug;
 
 	ENTER();
+	if (pamh == NULL)
+		RETURNC(PAM_SYSTEM_ERR);
 
 	/* prevent recursion */
 	if (pamh->current != NULL) {
@@ -105,7 +109,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_SYMBOL_ERR;
+			r = PAM_SYSTEM_ERR;
 		} else {
 			pamh->primitive = primitive;
 			pamh->current = chain;

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifndef OPENPAM_FEATURES_H_INCLUDED

lib/libpam/openpam_findenv.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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,13 +31,14 @@
  * 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <errno.h>
 #include <string.h>
 
 #include <security/pam_appl.h>
@@ -58,11 +59,12 @@ openpam_findenv(pam_handle_t *pamh,
 	int i;
 
 	ENTER();
+	if (pamh == NULL)
+		RETURNN(-1);
 	for (i = 0; i < pamh->env_count; ++i)
 		if (strncmp(pamh->env[i], name, len) == 0 &&
 		    pamh->env[i][len] == '=')
 			RETURNN(i);
-	errno = ENOENT;
 	RETURNN(-1);
 }
 

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

lib/libpam/openpam_get_feature.c

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012-2017 Dag-Erling Smørgrav
+ * Copyright (c) 2012 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -48,7 +50,7 @@ openpam_get_feature(int feature, int *onoff)
 
 	ENTERF(feature);
 	if (feature < 0 || feature >= OPENPAM_NUM_FEATURES)
-		RETURNC(PAM_BAD_FEATURE);
+		RETURNC(PAM_SYMBOL_ERR);
 	*onoff = openpam_features[feature].onoff;
 	RETURNC(PAM_SUCCESS);
 }
@@ -56,7 +58,7 @@ openpam_get_feature(int feature, int *onoff)
 /*
  * Error codes:
  *
- *	PAM_BAD_FEATURE
+ *	PAM_SYMBOL_ERR
  */
 
 /**

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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

lib/libpam/openpam_impl.h

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifndef OPENPAM_IMPL_H_INCLUDED
@@ -128,28 +130,19 @@ struct pam_handle {
 /*
  * Internal functions
  */
-int		 openpam_configure(pam_handle_t *, const char *)
-	OPENPAM_NONNULL((1));
-int		 openpam_dispatch(pam_handle_t *, int, int)
-	OPENPAM_NONNULL((1));
-int		 openpam_findenv(pam_handle_t *, const char *, size_t)
-	OPENPAM_NONNULL((1,2));
-pam_module_t	*openpam_load_module(const char *)
-	OPENPAM_NONNULL((1));
-void		 openpam_clear_chains(pam_chain_t **)
-	OPENPAM_NONNULL((1));
+int		 openpam_configure(pam_handle_t *, const char *);
+int		 openpam_dispatch(pam_handle_t *, int, int);
+int		 openpam_findenv(pam_handle_t *, const char *, size_t);
+pam_module_t	*openpam_load_module(const char *);
+void		 openpam_clear_chains(pam_chain_t **);
 
-int		 openpam_check_desc_owner_perms(const char *, int)
-	OPENPAM_NONNULL((1));
-int		 openpam_check_path_owner_perms(const char *)
-	OPENPAM_NONNULL((1));
+int		 openpam_check_desc_owner_perms(const char *, int);
+int		 openpam_check_path_owner_perms(const char *);
 
 #ifdef OPENPAM_STATIC_MODULES
-pam_module_t	*openpam_static(const char *)
-	OPENPAM_NONNULL((1));
+pam_module_t	*openpam_static(const char *);
 #endif
-pam_module_t	*openpam_dynamic(const char *)
-	OPENPAM_NONNULL((1));
+pam_module_t	*openpam_dynamic(const char *);
 
 #define	FREE(p)					\
 	do {					\
@@ -159,11 +152,11 @@ pam_module_t	*openpam_dynamic(const char *)
 
 #define FREEV(c, v)				\
 	do {					\
-		if ((v) != NULL) {		\
-			while ((c)-- > 0)	\
-				FREE((v)[(c)]);	\
-			FREE(v);		\
+		while (c) {			\
+			--(c);			\
+			FREE((v)[(c)]);		\
 		}				\
+		FREE(v);			\
 	} while (0)
 
 #include "openpam_constants.h"

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012-2017 Dag-Erling Smørgrav
+ * Copyright (c) 2012-2014 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.
+ *
+ * $Id$
  */
 
 #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_ERROR, "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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

lib/libpam/openpam_set_feature.c

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012-2017 Dag-Erling Smørgrav
+ * Copyright (c) 2012 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -48,7 +50,7 @@ openpam_set_feature(int feature, int onoff)
 
 	ENTERF(feature);
 	if (feature < 0 || feature >= OPENPAM_NUM_FEATURES)
-		RETURNC(PAM_BAD_FEATURE);
+		RETURNC(PAM_SYMBOL_ERR);
 	openpam_features[feature].onoff = onoff;
 	RETURNC(PAM_SUCCESS);
 }
@@ -56,7 +58,7 @@ openpam_set_feature(int feature, int onoff)
 /*
  * Error codes:
  *
- *	PAM_BAD_FEATURE
+ *	PAM_SYMBOL_ERR
  */
 
 /**

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -92,6 +94,12 @@ prompt_tty(int ifd, int ofd, const char *message, char *response, int echo)
 	int pos, ret;
 	char ch;
 
+	/* write prompt */
+	if (write(ofd, message, strlen(message)) < 0) {
+		openpam_log(PAM_LOG_ERROR, "write(): %m");
+		return (-1);
+	}
+
 	/* turn echo off if requested */
 	slflag = 0; /* prevent bogus uninitialized variable warning */
 	if (!echo) {
@@ -107,12 +115,6 @@ prompt_tty(int ifd, int ofd, const char *message, char *response, int echo)
 		}
 	}
 
-	/* write prompt */
-	if (write(ofd, message, strlen(message)) < 0) {
-		openpam_log(PAM_LOG_ERROR, "write(): %m");
-		return (-1);
-	}
-
 	/* install signal handlers */
 	caught_signal = 0;
 	action.sa_handler = &catch_signal;

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

lib/libpam/pam_authenticate.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -58,7 +60,7 @@ pam_authenticate(pam_handle_t *pamh,
 
 	ENTER();
 	if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK))
-		RETURNC(PAM_BAD_CONSTANT);
+		RETURNC(PAM_SYMBOL_ERR);
 	r = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags);
 	pam_set_item(pamh, PAM_AUTHTOK, NULL);
 	RETURNC(r);
@@ -70,7 +72,7 @@ pam_authenticate(pam_handle_t *pamh,
  *	=openpam_dispatch
  *	=pam_sm_authenticate
  *	!PAM_IGNORE
- *	PAM_BAD_CONSTANT
+ *	PAM_SYMBOL_ERR
  */
 
 /**
@@ -90,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_BAD_CONSTANT.
+ * =PAM_SYMBOL_ERR.
  */

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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H

lib/libpam/pam_chauthtok.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -58,7 +60,7 @@ pam_chauthtok(pam_handle_t *pamh,
 
 	ENTER();
 	if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK))
-		RETURNC(PAM_BAD_CONSTANT);
+		RETURNC(PAM_SYMBOL_ERR);
 	r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK,
 	    flags | PAM_PRELIM_CHECK);
 	if (r == PAM_SUCCESS)
@@ -75,7 +77,7 @@ pam_chauthtok(pam_handle_t *pamh,
  *	=openpam_dispatch
  *	=pam_sm_chauthtok
  *	!PAM_IGNORE
- *	PAM_BAD_CONSTANT
+ *	PAM_SYMBOL_ERR
  */
 
 /**
@@ -91,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_BAD_CONSTANT.
+ * If any other bits are set, =pam_chauthtok will return =PAM_SYMBOL_ERR.
  */

lib/libpam/pam_close_session.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -58,7 +60,7 @@ pam_close_session(pam_handle_t *pamh,
 
 	ENTER();
 	if (flags & ~(PAM_SILENT))
-		RETURNC(PAM_BAD_CONSTANT);
+		RETURNC(PAM_SYMBOL_ERR);
 	r = openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags);
 	RETURNC(r);
 }
@@ -69,7 +71,7 @@ pam_close_session(pam_handle_t *pamh,
  *	=openpam_dispatch
  *	=pam_sm_close_session
  *	!PAM_IGNORE
- *	PAM_BAD_CONSTANT
+ *	PAM_SYMBOL_ERR
  */
 
 /**
@@ -83,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_BAD_CONSTANT.
+ * =PAM_SYMBOL_ERR.
  */

lib/libpam/pam_end.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -59,7 +61,7 @@ pam_end(pam_handle_t *pamh,
 
 	ENTER();
 	if (pamh == NULL)
-		RETURNC(PAM_BAD_HANDLE);
+		RETURNC(PAM_SYSTEM_ERR);
 
 	/* clear module data */
 	while ((dp = pamh->module_data) != NULL) {
@@ -92,7 +94,7 @@ pam_end(pam_handle_t *pamh,
 /*
  * Error codes:
  *
- *	PAM_BAD_HANDLE
+ *	PAM_SYSTEM_ERR
  */
 
 /**

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -74,6 +76,8 @@ pam_get_authtok(pam_handle_t *pamh,
 	int pitem, r, style, twice;
 
 	ENTER();
+	if (pamh == NULL || authtok == NULL)
+		RETURNC(PAM_SYSTEM_ERR);
 	*authtok = NULL;
 	twice = 0;
 	switch (item) {
@@ -102,7 +106,7 @@ pam_get_authtok(pam_handle_t *pamh,
 		twice = 0;
 		break;
 	default:
-		RETURNC(PAM_BAD_CONSTANT);
+		RETURNC(PAM_SYMBOL_ERR);
 	}
 	if (openpam_get_option(pamh, "try_first_pass") ||
 	    openpam_get_option(pamh, "use_first_pass")) {
@@ -168,7 +172,6 @@ pam_get_authtok(pam_handle_t *pamh,
  *	=pam_prompt
  *	=pam_set_item
  *	!PAM_SYMBOL_ERR
- *	PAM_BAD_CONSTANT
  *	PAM_TRY_AGAIN
  */
 

lib/libpam/pam_get_data.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -58,6 +60,8 @@ pam_get_data(const pam_handle_t *pamh,
 	pam_data_t *dp;
 
 	ENTERS(module_data_name);
+	if (pamh == NULL)
+		RETURNC(PAM_SYSTEM_ERR);
 	for (dp = pamh->module_data; dp != NULL; dp = dp->next) {
 		if (strcmp(dp->name, module_data_name) == 0) {
 			*data = (void *)dp->data;
@@ -70,6 +74,7 @@ pam_get_data(const pam_handle_t *pamh,
 /*
  * Error codes:
  *
+ *	PAM_SYSTEM_ERR
  *	PAM_NO_MODULE_DATA
  */
 

lib/libpam/pam_get_item.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -57,6 +59,8 @@ pam_get_item(const pam_handle_t *pamh,
 {
 
 	ENTERI(item_type);
+	if (pamh == NULL)
+		RETURNC(PAM_SYSTEM_ERR);
 	switch (item_type) {
 	case PAM_SERVICE:
 	case PAM_USER:
@@ -74,14 +78,15 @@ pam_get_item(const pam_handle_t *pamh,
 		*item = pamh->item[item_type];
 		RETURNC(PAM_SUCCESS);
 	default:
-		RETURNC(PAM_BAD_ITEM);
+		RETURNC(PAM_SYMBOL_ERR);
 	}
 }
 
 /*
  * Error codes:
  *
- *	PAM_BAD_ITEM
+ *	PAM_SYMBOL_ERR
+ *	PAM_SYSTEM_ERR
  */
 
 /**

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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
@@ -67,6 +69,8 @@ pam_get_user(pam_handle_t *pamh,
 	int r;
 
 	ENTER();
+	if (pamh == NULL || user == NULL)
+		RETURNC(PAM_SYSTEM_ERR);
 	r = pam_get_item(pamh, PAM_USER, (const void **)user);
 	if (r == PAM_SUCCESS && *user != NULL)
 		RETURNC(PAM_SUCCESS);

lib/libpam/pam_getenv.c

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2019 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,13 +31,14 @@
  * 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.
+ *
+ * $Id$
  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -56,20 +57,23 @@ const char *
 pam_getenv(pam_handle_t *pamh,
 	const char *name)
 {
-	size_t len;
+	char *str;
 	int i;
 
 	ENTERS(name);
-	for (len = 0; name[len] != '\0'; ++len) {
-		if (name[len] == '=') {
-			errno = EINVAL;
-			RETURNS(NULL);
+	if (pamh == NULL)
+		RETURNS(NULL);
+	if (name == NULL || strchr(name, '=') != NULL)
+		RETURNS(NULL);
+	if ((i = openpam_findenv(pamh, name, strlen(name))) < 0)
+		RETURNS(NULL);
+	for (str = pamh->env[i]; *str != '\0'; ++str) {
+		if (*str == '=') {
+			++str;
+			break;
 		}
 	}
-	if ((i = openpam_findenv(pamh, name, len)) < 0)
-		RETURNS(NULL);
-	/* assert(pamh->env[i][len] == '='); */
-	RETURNS(pamh->env[i] + len + 1);
+	RETURNS(str);
 }
 
 /**