merge conflicts. Unfortunately openpam changed from $P4 -> $Id so there will trunk
authorchristos <christos@NetBSD.org>
Sun, 27 Jan 2008 01:22:55 +0000
branchtrunk
changeset 166256 8088071fee92
parent 166255 7285af1014ed
child 166257 43e110495803
merge conflicts. Unfortunately openpam changed from $P4 -> $Id so there will be RCS screwage in the next import.
dist/openpam/MANIFEST
dist/openpam/doc/man/openpam.3
dist/openpam/doc/man/openpam_borrow_cred.3
dist/openpam/doc/man/openpam_free_data.3
dist/openpam/doc/man/openpam_get_option.3
dist/openpam/doc/man/openpam_log.3
dist/openpam/doc/man/openpam_nullconv.3
dist/openpam/doc/man/openpam_readline.3
dist/openpam/doc/man/openpam_restore_cred.3
dist/openpam/doc/man/openpam_set_option.3
dist/openpam/doc/man/openpam_ttyconv.3
dist/openpam/doc/man/pam.3
dist/openpam/doc/man/pam_acct_mgmt.3
dist/openpam/doc/man/pam_authenticate.3
dist/openpam/doc/man/pam_chauthtok.3
dist/openpam/doc/man/pam_close_session.3
dist/openpam/doc/man/pam_conv.3
dist/openpam/doc/man/pam_end.3
dist/openpam/doc/man/pam_error.3
dist/openpam/doc/man/pam_get_authtok.3
dist/openpam/doc/man/pam_get_data.3
dist/openpam/doc/man/pam_get_item.3
dist/openpam/doc/man/pam_get_user.3
dist/openpam/doc/man/pam_getenv.3
dist/openpam/doc/man/pam_getenvlist.3
dist/openpam/doc/man/pam_info.3
dist/openpam/doc/man/pam_open_session.3
dist/openpam/doc/man/pam_prompt.3
dist/openpam/doc/man/pam_putenv.3
dist/openpam/doc/man/pam_set_data.3
dist/openpam/doc/man/pam_set_item.3
dist/openpam/doc/man/pam_setcred.3
dist/openpam/doc/man/pam_setenv.3
dist/openpam/doc/man/pam_sm_acct_mgmt.3
dist/openpam/doc/man/pam_sm_authenticate.3
dist/openpam/doc/man/pam_sm_chauthtok.3
dist/openpam/doc/man/pam_sm_close_session.3
dist/openpam/doc/man/pam_sm_open_session.3
dist/openpam/doc/man/pam_sm_setcred.3
dist/openpam/doc/man/pam_start.3
dist/openpam/doc/man/pam_strerror.3
dist/openpam/doc/man/pam_verror.3
dist/openpam/doc/man/pam_vinfo.3
dist/openpam/doc/man/pam_vprompt.3
dist/openpam/include/security/openpam.h
dist/openpam/include/security/pam_constants.h
dist/openpam/lib/openpam_borrow_cred.c
dist/openpam/lib/openpam_configure.c
dist/openpam/lib/openpam_dispatch.c
dist/openpam/lib/openpam_dynamic.c
dist/openpam/lib/openpam_findenv.c
dist/openpam/lib/openpam_free_data.c
dist/openpam/lib/openpam_get_option.c
dist/openpam/lib/openpam_impl.h
dist/openpam/lib/openpam_load.c
dist/openpam/lib/openpam_nullconv.c
dist/openpam/lib/openpam_readline.c
dist/openpam/lib/openpam_restore_cred.c
dist/openpam/lib/openpam_set_option.c
dist/openpam/lib/openpam_static.c
dist/openpam/lib/openpam_ttyconv.c
dist/openpam/lib/pam_acct_mgmt.c
dist/openpam/lib/pam_authenticate.c
dist/openpam/lib/pam_chauthtok.c
dist/openpam/lib/pam_close_session.c
dist/openpam/lib/pam_end.c
dist/openpam/lib/pam_get_authtok.c
dist/openpam/lib/pam_get_data.c
dist/openpam/lib/pam_get_item.c
dist/openpam/lib/pam_get_user.c
dist/openpam/lib/pam_getenv.c
dist/openpam/lib/pam_getenvlist.c
dist/openpam/lib/pam_open_session.c
dist/openpam/lib/pam_putenv.c
dist/openpam/lib/pam_set_data.c
dist/openpam/lib/pam_set_item.c
dist/openpam/lib/pam_setcred.c
dist/openpam/lib/pam_setenv.c
dist/openpam/lib/pam_start.c
dist/openpam/lib/pam_strerror.c
dist/openpam/lib/pam_vprompt.c
dist/openpam/misc/gendoc.pl
--- a/dist/openpam/MANIFEST	Sun Jan 27 00:54:36 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-#
-# $P4: //depot/projects/openpam/MANIFEST#21 $
-#
-CREDITS
-HISTORY
-INSTALL
-LICENSE
-MANIFEST
-Makefile.am
-Makefile.in
-README
-RELNOTES
-aclocal.m4
-autogen.sh
-config.guess
-config.h.in
-config.sub
-configure
-configure.ac
-depcomp
-install-sh
-ltmain.sh
-missing
-bin/
-bin/Makefile.am
-bin/Makefile.in
-bin/su/
-bin/su/Makefile.am
-bin/su/Makefile.in
-bin/su/su.c
-doc/
-doc/Makefile.am
-doc/Makefile.in
-doc/man/
-doc/man/Makefile.am
-doc/man/Makefile.in
-doc/man/openpam.3
-doc/man/openpam.man
-doc/man/openpam_borrow_cred.3
-doc/man/openpam_free_data.3
-doc/man/openpam_free_envlist.3
-doc/man/openpam_get_option.3
-doc/man/openpam_log.3
-doc/man/openpam_nullconv.3
-doc/man/openpam_readline.3
-doc/man/openpam_restore_cred.3
-doc/man/openpam_set_option.3
-doc/man/openpam_ttyconv.3
-doc/man/pam.3
-doc/man/pam.conf.5
-doc/man/pam.man
-doc/man/pam_acct_mgmt.3
-doc/man/pam_authenticate.3
-doc/man/pam_chauthtok.3
-doc/man/pam_close_session.3
-doc/man/pam_conv.3
-doc/man/pam_end.3
-doc/man/pam_error.3
-doc/man/pam_get_authtok.3
-doc/man/pam_get_data.3
-doc/man/pam_get_item.3
-doc/man/pam_get_user.3
-doc/man/pam_getenv.3
-doc/man/pam_getenvlist.3
-doc/man/pam_info.3
-doc/man/pam_open_session.3
-doc/man/pam_prompt.3
-doc/man/pam_putenv.3
-doc/man/pam_set_data.3
-doc/man/pam_set_item.3
-doc/man/pam_setcred.3
-doc/man/pam_setenv.3
-doc/man/pam_sm_acct_mgmt.3
-doc/man/pam_sm_authenticate.3
-doc/man/pam_sm_chauthtok.3
-doc/man/pam_sm_close_session.3
-doc/man/pam_sm_open_session.3
-doc/man/pam_sm_setcred.3
-doc/man/pam_start.3
-doc/man/pam_strerror.3
-doc/man/pam_verror.3
-doc/man/pam_vinfo.3
-doc/man/pam_vprompt.3
-include/
-include/Makefile.am
-include/Makefile.in
-include/security/
-include/security/Makefile.am
-include/security/Makefile.in
-include/security/openpam.h
-include/security/openpam_version.h
-include/security/pam_appl.h
-include/security/pam_constants.h
-include/security/pam_modules.h
-include/security/pam_types.h
-lib/
-lib/Makefile.am
-lib/Makefile.in
-lib/openpam_borrow_cred.c
-lib/openpam_configure.c
-lib/openpam_dispatch.c
-lib/openpam_dynamic.c
-lib/openpam_findenv.c
-lib/openpam_free_data.c
-lib/openpam_free_envlist.c
-lib/openpam_get_option.c
-lib/openpam_impl.h
-lib/openpam_load.c
-lib/openpam_log.c
-lib/openpam_nullconv.c
-lib/openpam_readline.c
-lib/openpam_restore_cred.c
-lib/openpam_set_option.c
-lib/openpam_static.c
-lib/openpam_ttyconv.c
-lib/pam_acct_mgmt.c
-lib/pam_authenticate.c
-lib/pam_authenticate_secondary.c
-lib/pam_chauthtok.c
-lib/pam_close_session.c
-lib/pam_end.c
-lib/pam_error.c
-lib/pam_get_authtok.c
-lib/pam_get_data.c
-lib/pam_get_item.c
-lib/pam_get_mapped_authtok.c
-lib/pam_get_mapped_username.c
-lib/pam_get_user.c
-lib/pam_getenv.c
-lib/pam_getenvlist.c
-lib/pam_info.c
-lib/pam_open_session.c
-lib/pam_prompt.c
-lib/pam_putenv.c
-lib/pam_set_data.c
-lib/pam_set_item.c
-lib/pam_set_mapped_authtok.c
-lib/pam_set_mapped_username.c
-lib/pam_setcred.c
-lib/pam_setenv.c
-lib/pam_sm_acct_mgmt.c
-lib/pam_sm_authenticate.c
-lib/pam_sm_authenticate_secondary.c
-lib/pam_sm_chauthtok.c
-lib/pam_sm_close_session.c
-lib/pam_sm_get_mapped_authtok.c
-lib/pam_sm_get_mapped_username.c
-lib/pam_sm_open_session.c
-lib/pam_sm_set_mapped_authtok.c
-lib/pam_sm_set_mapped_username.c
-lib/pam_sm_setcred.c
-lib/pam_start.c
-lib/pam_strerror.c
-lib/pam_verror.c
-lib/pam_vinfo.c
-lib/pam_vprompt.c
-misc/
-misc/gendoc.pl
-modules/
-modules/Makefile.am
-modules/Makefile.in
-modules/pam_deny/
-modules/pam_deny/Makefile.am
-modules/pam_deny/Makefile.in
-modules/pam_deny/pam_deny.c
-modules/pam_permit/
-modules/pam_permit/Makefile.am
-modules/pam_permit/Makefile.in
-modules/pam_permit/pam_permit.c
-modules/pam_unix/
-modules/pam_unix/Makefile.am
-modules/pam_unix/Makefile.in
-modules/pam_unix/pam_unix.c
--- a/dist/openpam/doc/man/openpam.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam.3,v 1.5 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM 3
 .Os
 .Sh NAME
@@ -83,23 +84,23 @@
 .Ft "int"
 .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
 .Ft "int"
-.Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..."
+.Fn pam_error "const pam_handle_t *pamh" "const char *fmt" "..."
 .Ft "int"
 .Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt"
 .Ft "int"
-.Fn pam_info "pam_handle_t *pamh" "const char *fmt" "..."
+.Fn pam_info "const pam_handle_t *pamh" "const char *fmt" "..."
 .Ft "int"
-.Fn pam_prompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..."
+.Fn pam_prompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..."
 .Ft "int"
 .Fn pam_setenv "pam_handle_t *pamh" "const char *name" "const char *value" "int overwrite"
 .Ft "int"
-.Fn pam_verror "pam_handle_t *pamh" "const char *fmt" "va_list ap"
+.Fn pam_verror "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Ft "int"
-.Fn pam_vinfo "pam_handle_t *pamh" "const char *fmt" "va_list ap"
+.Fn pam_vinfo "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Ft "int"
-.Fn pam_vprompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
+.Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
 .\"
-.\" $P4: //depot/projects/openpam/doc/man/openpam.man#2 $
+.\" $Id: openpam.3,v 1.5 2008/01/27 01:22:55 christos Exp $
 .\"
 .Sh DESCRIPTION
 These functions are OpenPAM extensions to the PAM API.
@@ -139,7 +140,7 @@
 The OpenPAM library and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_borrow_cred.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_borrow_cred.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_borrow_cred.3,v 1.7 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_borrow_cred.3,v 1.8 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_BORROW_CRED 3
 .Os
 .Sh NAME
@@ -89,7 +90,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_free_data.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_free_data.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_free_data.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_free_data.3,v 1.5 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_FREE_DATA 3
 .Os
 .Sh NAME
@@ -73,7 +74,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_get_option.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_get_option.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_get_option.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_get_option.3,v 1.6 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_GET_OPTION 3
 .Os
 .Sh NAME
@@ -75,7 +76,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_log.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_log.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_log.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_log.3,v 1.5 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_LOG 3
 .Os
 .Sh NAME
@@ -110,7 +111,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_nullconv.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_nullconv.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_nullconv.3,v 1.6 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_nullconv.3,v 1.7 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_NULLCONV 3
 .Os
 .Sh NAME
@@ -95,7 +96,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_readline.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_readline.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_readline.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_readline.3,v 1.5 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_READLINE 3
 .Os
 .Sh NAME
@@ -104,7 +105,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_restore_cred.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_restore_cred.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_restore_cred.3,v 1.7 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_restore_cred.3,v 1.8 2008/01/27 01:22:55 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_RESTORE_CRED 3
 .Os
 .Sh NAME
@@ -81,7 +82,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_set_option.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_set_option.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_set_option.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: openpam_set_option.3,v 1.6 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt OPENPAM_SET_OPTION 3
 .Os
 .Sh NAME
@@ -78,7 +79,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/openpam_ttyconv.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/openpam_ttyconv.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: openpam_ttyconv.3,v 1.6 2006/06/14 16:22:54 christos Exp $
+.\"	$NetBSD: openpam_ttyconv.3,v 1.7 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 14, 2006
+.Dd December 21, 2007
 .Dt OPENPAM_TTYCONV 3
 .Os
 .Sh NAME
@@ -101,7 +102,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM 3
 .Os
 .Sh NAME
@@ -72,9 +73,9 @@
 .Ft "int"
 .Fn pam_end "pam_handle_t *pamh" "int status"
 .Ft "int"
-.Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "void **data"
+.Fn pam_get_data "const pam_handle_t *pamh" "const char *module_data_name" "const void **data"
 .Ft "int"
-.Fn pam_get_item "pam_handle_t *pamh" "int item_type" "const void **item"
+.Fn pam_get_item "const pam_handle_t *pamh" "int item_type" "const void **item"
 .Ft "int"
 .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt"
 .Ft "const char *"
@@ -94,9 +95,9 @@
 .Ft "int"
 .Fn pam_start "const char *service" "const char *user" "const struct pam_conv *pam_conv" "pam_handle_t **pamh"
 .Ft "const char *"
-.Fn pam_strerror "pam_handle_t *pamh" "int error_number"
+.Fn pam_strerror "const pam_handle_t *pamh" "int error_number"
 .\"
-.\" $P4: //depot/projects/openpam/doc/man/pam.man#4 $
+.\" $Id: pam.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .Sh DESCRIPTION
 The Pluggable Authentication Modules (PAM) library abstracts a number
@@ -288,7 +289,7 @@
 The OpenPAM library and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_acct_mgmt.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_acct_mgmt.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_acct_mgmt.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_acct_mgmt.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_ACCT_MGMT 3
 .Os
 .Sh NAME
@@ -109,7 +110,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_authenticate.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_authenticate.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_authenticate.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_authenticate.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_AUTHENTICATE 3
 .Os
 .Sh NAME
@@ -123,7 +124,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_chauthtok.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_chauthtok.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_chauthtok.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_chauthtok.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_CHAUTHTOK 3
 .Os
 .Sh NAME
@@ -115,7 +116,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_close_session.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_close_session.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_close_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_close_session.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_CLOSE_SESSION 3
 .Os
 .Sh NAME
@@ -105,7 +106,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_conv.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_conv.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_conv.3,v 1.4 2005/02/20 19:33:59 wiz Exp $
+.\"	$NetBSD: pam_conv.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -33,9 +34,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#4 $
+.\" $Id: pam_conv.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
-.Dd May 27, 2002
+.Dd June 16, 2005
 .Dt PAM_CONV 3
 .Os
 .Sh NAME
--- a/dist/openpam/doc/man/pam_end.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_end.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_end.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_end.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_END 3
 .Os
 .Sh NAME
@@ -82,7 +83,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_error.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_error.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_error.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_error.3,v 1.6 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_ERROR 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..."
+.Fn pam_error "const pam_handle_t *pamh" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Nm
@@ -81,7 +82,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_get_authtok.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_get_authtok.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_get_authtok.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_get_authtok.3,v 1.6 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_GET_AUTHTOK 3
 .Os
 .Sh NAME
@@ -128,7 +129,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_get_data.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_get_data.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_get_data.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_get_data.3,v 1.5 2008/01/27 01:22:56 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_GET_DATA 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "void **data"
+.Fn pam_get_data "const pam_handle_t *pamh" "const char *module_data_name" "const void **data"
 .Sh DESCRIPTION
 The
 .Nm
@@ -91,7 +92,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_get_item.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_get_item.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_get_item.3,v 1.8 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_get_item.3,v 1.9 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_GET_ITEM 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_get_item "pam_handle_t *pamh" "int item_type" "const void **item"
+.Fn pam_get_item "const pam_handle_t *pamh" "int item_type" "const void **item"
 .Sh DESCRIPTION
 The
 .Nm
@@ -131,7 +132,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_get_user.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_get_user.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_get_user.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_get_user.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_GET_USER 3
 .Os
 .Sh NAME
@@ -105,7 +106,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_getenv.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_getenv.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_getenv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_getenv.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_GETENV 3
 .Os
 .Sh NAME
@@ -79,7 +80,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_getenvlist.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_getenvlist.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_getenvlist.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_getenvlist.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_GETENVLIST 3
 .Os
 .Sh NAME
@@ -101,7 +102,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_info.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_info.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_info.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_info.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_INFO 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_info "pam_handle_t *pamh" "const char *fmt" "..."
+.Fn pam_info "const pam_handle_t *pamh" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Nm
@@ -81,7 +82,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_open_session.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_open_session.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_open_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_open_session.3,v 1.5 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_OPEN_SESSION 3
 .Os
 .Sh NAME
@@ -106,7 +107,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_prompt.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_prompt.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_prompt.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_prompt.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_PROMPT 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_prompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..."
+.Fn pam_prompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Nm
@@ -93,7 +94,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_putenv.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_putenv.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_putenv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_putenv.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_PUTENV 3
 .Os
 .Sh NAME
@@ -84,7 +85,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_set_data.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_set_data.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_set_data.3,v 1.6 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_set_data.3,v 1.7 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SET_DATA 3
 .Os
 .Sh NAME
@@ -96,7 +97,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_set_item.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_set_item.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_set_item.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_set_item.3,v 1.5 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SET_ITEM 3
 .Os
 .Sh NAME
@@ -89,7 +90,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_setcred.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_setcred.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_setcred.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_setcred.3,v 1.5 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SETCRED 3
 .Os
 .Sh NAME
@@ -118,7 +119,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_setenv.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_setenv.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_setenv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_setenv.3,v 1.6 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SETENV 3
 .Os
 .Sh NAME
@@ -83,7 +84,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_sm_acct_mgmt.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_sm_acct_mgmt.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_sm_acct_mgmt.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_sm_acct_mgmt.3,v 1.5 2008/01/27 01:22:57 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SM_ACCT_MGMT 3
 .Os
 .Sh NAME
@@ -99,7 +100,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_sm_authenticate.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_sm_authenticate.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_sm_authenticate.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_sm_authenticate.3,v 1.5 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SM_AUTHENTICATE 3
 .Os
 .Sh NAME
@@ -101,7 +102,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_sm_chauthtok.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_sm_chauthtok.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_sm_chauthtok.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_sm_chauthtok.3,v 1.5 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SM_CHAUTHTOK 3
 .Os
 .Sh NAME
@@ -101,7 +102,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_sm_close_session.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_sm_close_session.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_sm_close_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_sm_close_session.3,v 1.5 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SM_CLOSE_SESSION 3
 .Os
 .Sh NAME
@@ -93,7 +94,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_sm_open_session.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_sm_open_session.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_sm_open_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_sm_open_session.3,v 1.5 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SM_OPEN_SESSION 3
 .Os
 .Sh NAME
@@ -93,7 +94,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_sm_setcred.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_sm_setcred.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_sm_setcred.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_sm_setcred.3,v 1.5 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_SM_SETCRED 3
 .Os
 .Sh NAME
@@ -99,7 +100,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_start.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_start.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_start.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_start.3,v 1.6 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_START 3
 .Os
 .Sh NAME
@@ -103,7 +104,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_strerror.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_strerror.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_strerror.3,v 1.4 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_strerror.3,v 1.5 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_STRERROR 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "const char *"
-.Fn pam_strerror "pam_handle_t *pamh" "int error_number"
+.Fn pam_strerror "const pam_handle_t *pamh" "int error_number"
 .Sh DESCRIPTION
 The
 .Nm
@@ -76,7 +77,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_verror.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_verror.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_verror.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_verror.3,v 1.6 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_VERROR 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_verror "pam_handle_t *pamh" "const char *fmt" "va_list ap"
+.Fn pam_verror "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Sh DESCRIPTION
 The
 .Nm
@@ -85,7 +86,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_vinfo.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_vinfo.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_vinfo.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_vinfo.3,v 1.6 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_VINFO 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_vinfo "pam_handle_t *pamh" "const char *fmt" "va_list ap"
+.Fn pam_vinfo "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Sh DESCRIPTION
 The
 .Nm
@@ -85,7 +86,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/doc/man/pam_vprompt.3	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/doc/man/pam_vprompt.3	Sun Jan 27 01:22:55 2008 +0000
@@ -1,7 +1,8 @@
-.\"	$NetBSD: pam_vprompt.3,v 1.5 2006/02/05 02:37:45 christos Exp $
+.\"	$NetBSD: pam_vprompt.3,v 1.6 2008/01/27 01:22:58 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -35,7 +36,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd June 16, 2005
+.Dd December 21, 2007
 .Dt PAM_VPROMPT 3
 .Os
 .Sh NAME
@@ -47,7 +48,7 @@
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
-.Fn pam_vprompt "pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
+.Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
 .Sh DESCRIPTION
 The
 .Nm
@@ -122,7 +123,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.& under
+Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
--- a/dist/openpam/include/security/openpam.h	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/include/security/openpam.h	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,17 +32,19 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#28 $
+ * $Id: openpam.h,v 1.9 2008/01/27 01:22:58 christos Exp $
  */
 
-#ifndef _SECURITY_OPENPAM_H_INCLUDED
-#define _SECURITY_OPENPAM_H_INCLUDED
+#ifndef SECURITY_OPENPAM_H_INCLUDED
+#define SECURITY_OPENPAM_H_INCLUDED
 
 /*
  * Annoying but necessary header pollution
  */
 #include <stdarg.h>
 
+#include <security/openpam_attr.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -53,7 +56,8 @@
  */
 int
 openpam_borrow_cred(pam_handle_t *_pamh,
-	const struct passwd *_pwd);
+	const struct passwd *_pwd)
+	OPENPAM_NONNULL((1,2));
 
 void
 openpam_free_data(pam_handle_t *_pamh,
@@ -68,7 +72,8 @@
 	const char *_option);
 
 int
-openpam_restore_cred(pam_handle_t *_pamh);
+openpam_restore_cred(pam_handle_t *_pamh)
+	OPENPAM_NONNULL((1));
 
 int
 openpam_set_option(pam_handle_t *_pamh,
@@ -76,50 +81,64 @@
 	const char *_value);
 
 int
-pam_error(pam_handle_t *_pamh,
+pam_error(const pam_handle_t *_pamh,
 	const char *_fmt,
-	...);
+	...)
+	OPENPAM_FORMAT ((__printf__, 2, 3))
+	OPENPAM_NONNULL((1,2));
 
 int
 pam_get_authtok(pam_handle_t *_pamh,
 	int _item,
 	const char **_authtok,
-	const char *_prompt);
+	const char *_prompt)
+	OPENPAM_NONNULL((1,3));
 
 int
-pam_info(pam_handle_t *_pamh,
+pam_info(const pam_handle_t *_pamh,
 	const char *_fmt,
-	...);
+	...)
+	OPENPAM_FORMAT ((__printf__, 2, 3))
+	OPENPAM_NONNULL((1,2));
 
 int
-pam_prompt(pam_handle_t *_pamh,
+pam_prompt(const pam_handle_t *_pamh,
 	int _style,
 	char **_resp,
 	const char *_fmt,
-	...);
+	...)
+	OPENPAM_FORMAT ((__printf__, 4, 5))
+	OPENPAM_NONNULL((1,4));
 
 int
 pam_setenv(pam_handle_t *_pamh,
 	const char *_name,
 	const char *_value,
-	int _overwrite);
+	int _overwrite)
+	OPENPAM_NONNULL((1,2,3));
 
 int
-pam_vinfo(pam_handle_t *_pamh,
+pam_vinfo(const pam_handle_t *_pamh,
 	const char *_fmt,
-	va_list _ap);
+	va_list _ap)
+	OPENPAM_FORMAT ((__printf__, 2, 0))
+	OPENPAM_NONNULL((1,2));
 
 int
-pam_verror(pam_handle_t *_pamh,
+pam_verror(const pam_handle_t *_pamh,
 	const char *_fmt,
-	va_list _ap);
+	va_list _ap)
+	OPENPAM_FORMAT ((__printf__, 2, 0))
+	OPENPAM_NONNULL((1,2));
 
 int
-pam_vprompt(pam_handle_t *_pamh,
+pam_vprompt(const pam_handle_t *_pamh,
 	int _style,
 	char **_resp,
 	const char *_fmt,
-	va_list _ap);
+	va_list _ap)
+	OPENPAM_FORMAT ((__printf__, 4, 0))
+	OPENPAM_NONNULL((1,4));
 
 /*
  * Read cooked lines.
@@ -130,7 +149,8 @@
 char *
 openpam_readline(FILE *_f,
 	int *_lineno,
-	size_t *_lenp);
+	size_t *_lenp)
+	OPENPAM_NONNULL((1));
 #endif
 
 /*
@@ -151,10 +171,8 @@
 	const char *_func,
 	const char *_fmt,
 	...)
-#if defined(__GNUC__)
-	__attribute__((__format__(__printf__, 3, 4)))
-#endif
-	;
+	OPENPAM_FORMAT ((__printf__, 3, 4))
+	OPENPAM_NONNULL((3));
 
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 #define openpam_log(lvl, ...) \
@@ -172,7 +190,9 @@
 void
 openpam_log(int _level,
 	const char *_format,
-	...);
+ 	...)
+ 	OPENPAM_FORMAT ((__printf__, 2, 3))
+	OPENPAM_NONNULL((2));
 #endif
 
 /*
@@ -217,6 +237,11 @@
 pam_sm_##type(pam_handle_t *pamh, int flags,				\
     int argc, const char *argv[])					\
 {									\
+									\
+	(void)pamh;							\
+	(void)flags;							\
+	(void)argc;							\
+	(void)argv;							\
 	return (PAM_IGNORE);						\
 }
 
@@ -234,9 +259,6 @@
 	char		*path;
 	pam_func_t	 func[PAM_NUM_PRIMITIVES];
 	void		*dlh;
-	int		 refcount;
-	pam_module_t	*prev;
-	pam_module_t	*next;
 };
 
 /*
@@ -244,99 +266,90 @@
  */
 #if defined(PAM_SM_AUTH) || defined(PAM_SM_ACCOUNT) || \
 	defined(PAM_SM_SESSION) || defined(PAM_SM_PASSWORD)
-#define LINUX_PAM_MODULE
+# define LINUX_PAM_MODULE
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_AUTH)
-#define _PAM_SM_AUTHENTICATE	0
-#define _PAM_SM_SETCRED		0
+# define _PAM_SM_AUTHENTICATE	0
+# define _PAM_SM_SETCRED	0
 #else
-#undef PAM_SM_AUTH
-#define PAM_SM_AUTH
-#define _PAM_SM_AUTHENTICATE	pam_sm_authenticate
-#define _PAM_SM_SETCRED		pam_sm_setcred
+# undef PAM_SM_AUTH
+# define PAM_SM_AUTH
+# define _PAM_SM_AUTHENTICATE	pam_sm_authenticate
+# define _PAM_SM_SETCRED	pam_sm_setcred
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_ACCOUNT)
-#define _PAM_SM_ACCT_MGMT	0
+# define _PAM_SM_ACCT_MGMT	0
 #else
-#undef PAM_SM_ACCOUNT
-#define PAM_SM_ACCOUNT
-#define _PAM_SM_ACCT_MGMT	pam_sm_acct_mgmt
+# undef PAM_SM_ACCOUNT
+# define PAM_SM_ACCOUNT
+# define _PAM_SM_ACCT_MGMT	pam_sm_acct_mgmt
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_SESSION)
-#define _PAM_SM_OPEN_SESSION	0
-#define _PAM_SM_CLOSE_SESSION	0
+# define _PAM_SM_OPEN_SESSION	0
+# define _PAM_SM_CLOSE_SESSION	0
 #else
-#undef PAM_SM_SESSION
-#define PAM_SM_SESSION
-#define _PAM_SM_OPEN_SESSION	pam_sm_open_session
-#define _PAM_SM_CLOSE_SESSION	pam_sm_close_session
+# undef PAM_SM_SESSION
+# define PAM_SM_SESSION
+# define _PAM_SM_OPEN_SESSION	pam_sm_open_session
+# define _PAM_SM_CLOSE_SESSION	pam_sm_close_session
 #endif
+
 #if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_PASSWORD)
-#define _PAM_SM_CHAUTHTOK	0
+# define _PAM_SM_CHAUTHTOK	0
 #else
-#undef PAM_SM_PASSWORD
-#define PAM_SM_PASSWORD
-#define _PAM_SM_CHAUTHTOK	pam_sm_chauthtok
+# undef PAM_SM_PASSWORD
+# define PAM_SM_PASSWORD
+# define _PAM_SM_CHAUTHTOK	pam_sm_chauthtok
 #endif
 
 /*
  * Infrastructure for static modules using GCC linker sets.
  * You are not expected to understand this.
  */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 # define PAM_SOEXT ".so"
-# if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES)
-#  define OPENPAM_STATIC_MODULE  /* enable static module macros */
-#  define OPENPAM_STATIC_MODULES /* enable static module support in libpam */
-# endif
-# if defined(OPENPAM_STATIC_MODULES) || defined(OPENPAM_STATIC_MODULE)
-#  include <sys/cdefs.h>
-#  include <linker_set.h>
-# endif
-# if defined(OPENPAM_STATIC_MODULE)
-#  define PAM_EXTERN static
-#  define PAM_MODULE_ENTRY(name)					\
-static char _pam_name[] = name PAM_SOEXT;				\
-static struct pam_module _pam_module = { _pam_name, {			\
-    _PAM_SM_AUTHENTICATE, _PAM_SM_SETCRED, _PAM_SM_ACCT_MGMT,		\
-    _PAM_SM_OPEN_SESSION, _PAM_SM_CLOSE_SESSION, _PAM_SM_CHAUTHTOK },	\
-    NULL, 0, NULL, NULL };						\
-DATA_SET(_openpam_static_modules, _pam_module)
-# endif
+#else
+# undef NO_STATIC_MODULES
+# define NO_STATIC_MODULES
+#endif
+
+#ifdef __NetBSD__
+#define DATA_SET(a, b) __link_set_add_data(a, b)
 #endif
 
-#if defined(__NetBSD__)
-# define PAM_SOEXT	".so"
-# if !defined(__GNUC__) || defined(NO_STATIC_MODULES)
-#  undef OPENPAM_STATIC_MODULE  /* disable static module macros */
-#  undef OPENPAM_STATIC_MODULES /* disable static module support in libpam */
-# endif
-# if defined(OPENPAM_STATIC_MODULES) || defined(OPENPAM_STATIC_MODULE)
-#  include <sys/cdefs.h>
+#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES)
+/* gcc, static linking */
+# include <sys/cdefs.h>
+# ifdef __FreeBSD__
+#  include <linker_set.h>
 # endif
-# if defined(OPENPAM_STATIC_MODULE)
-#  define PAM_EXTERN static
-#  define PAM_MODULE_ENTRY(name)					\
-static char _pam_name[] = name PAM_SOEXT;				\
-static struct pam_module _pam_module = { _pam_name, {			\
-    _PAM_SM_AUTHENTICATE, _PAM_SM_SETCRED, _PAM_SM_ACCT_MGMT,		\
-    _PAM_SM_OPEN_SESSION, _PAM_SM_CLOSE_SESSION, _PAM_SM_CHAUTHTOK },	\
-    NULL, 0, NULL, NULL };						\
-__link_set_add_data(_openpam_static_modules, _pam_module)
-# endif
-#endif
-
-#if !defined(PAM_SOPREFIX)
-#define	PAM_SOPREFIX		""
-#endif
-
-#if !defined(OPENPAM_STATIC_MODULE)
-#define	PAM_EXTERN		/* nothing */
-#define	PAM_MODULE_ENTRY(name)	/*LINTED empty decl*/
+# define OPENPAM_STATIC_MODULES
+# define PAM_EXTERN static
+# define PAM_MODULE_ENTRY(name)						\
+	static char _pam_name[] = name PAM_SOEXT;			\
+	static struct pam_module _pam_module = {			\
+		.path = _pam_name,					\
+		.func = {						\
+			[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		\
+		},							\
+	};								\
+	DATA_SET(_openpam_static_modules, _pam_module)
+#else
+/* normal case */
+# define PAM_EXTERN
+# define PAM_MODULE_ENTRY(name)
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* !SECURITY_OPENPAM_H_INCLUDED */
--- a/dist/openpam/include/security/pam_constants.h	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/include/security/pam_constants.h	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,11 +32,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_constants.h#22 $
+ * $Id: pam_constants.h,v 1.4 2008/01/27 01:22:58 christos Exp $
  */
 
-#ifndef _PAM_CONSTANTS_H_INCLUDED
-#define _PAM_CONSTANTS_H_INCLUDED
+#ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
+#define SECURITY_PAM_CONSTANTS_H_INCLUDED
 
 #include <security/openpam_version.h>
 
@@ -134,4 +135,4 @@
 }
 #endif
 
-#endif
+#endif /* !SECURITY_PAM_CONSTANTS_H_INCLUDED */
--- a/dist/openpam/lib/openpam_borrow_cred.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_borrow_cred.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#13 $
+ * $Id: openpam_borrow_cred.c,v 1.6 2008/01/27 01:22:58 christos Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +58,7 @@
 	const struct passwd *pwd)
 {
 	struct pam_saved_cred *scred;
-	void *scredp;
+	const void *scredp;
 	int r;
 
 	ENTERI(pwd->pw_uid);
--- a/dist/openpam/lib/openpam_configure.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_configure.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_configure.c#11 $
+ * $Id: openpam_configure.c,v 1.5 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <ctype.h>
--- a/dist/openpam/lib/openpam_dispatch.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_dispatch.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#21 $
+ * $Id: openpam_dispatch.c,v 1.4 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/openpam_dynamic.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_dynamic.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#14 $
+ * $Id: openpam_dynamic.c,v 1.7 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <dlfcn.h>
--- a/dist/openpam/lib/openpam_findenv.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_findenv.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_findenv.c#12 $
+ * $Id: openpam_findenv.c,v 1.3 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <string.h>
--- a/dist/openpam/lib/openpam_free_data.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_free_data.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_free_data.c#7 $
+ * $Id: openpam_free_data.c,v 1.4 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/openpam_get_option.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_get_option.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_get_option.c#10 $
+ * $Id: openpam_get_option.c,v 1.3 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/openpam_impl.h	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_impl.h	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_impl.h#29 $
+ * $Id: openpam_impl.h,v 1.5 2008/01/27 01:22:59 christos Exp $
  */
 
 #ifndef _OPENPAM_IMPL_H_INCLUDED
--- a/dist/openpam/lib/openpam_load.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_load.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_load.c#21 $
+ * $Id: openpam_load.c,v 1.4 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <dlfcn.h>
@@ -60,11 +61,8 @@
 	"pam_sm_chauthtok"
 };
 
-static pam_module_t *modules;
-
 /*
- * Locate a matching dynamic or static module.  Keep a list of previously
- * found modules to speed up the process.
+ * Locate a matching dynamic or static module.
  */
 
 pam_module_t *
@@ -72,12 +70,6 @@
 {
 	pam_module_t *module;
 
-	/* check cache first */
-	for (module = modules; module != NULL; module = module->next)
-		if (strcmp(module->path, path) == 0)
-			goto found;
-
-	/* nope; try to load */
 	module = openpam_dynamic(path);
 	openpam_log(PAM_LOG_DEBUG, "%s dynamic %s",
 	    (module == NULL) ? "no" : "using", path);
@@ -94,14 +86,6 @@
 		openpam_log(PAM_LOG_ERROR, "no %s found", path);
 		return (NULL);
 	}
-	openpam_log(PAM_LOG_DEBUG, "adding %s to cache", module->path);
-	module->next = modules;
-	if (module->next != NULL)
-		module->next->prev = module;
-	module->prev = NULL;
-	modules = module;
- found:
-	++module->refcount;
 	return (module);
 }
 
@@ -116,25 +100,10 @@
 {
 	if (module == NULL)
 		return;
-	--module->refcount;
-	if (module->refcount > 0)
-		/* still in use */
-		return;
-	if (module->refcount < 0) {
-		openpam_log(PAM_LOG_ERROR, "module %s has negative refcount",
-		    module->path);
-		module->refcount = 0;
-	}
 	if (module->dlh == NULL)
 		/* static module */
 		return;
 	dlclose(module->dlh);
-	if (module->prev != NULL)
-		module->prev->next = module->next;
-	if (module->next != NULL)
-		module->next->prev = module->prev;
-	if (module == modules)
-		modules = module->next;
 	openpam_log(PAM_LOG_DEBUG, "releasing %s", module->path);
 	FREE(module->path);
 	FREE(module);
--- a/dist/openpam/lib/openpam_nullconv.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_nullconv.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#7 $
+ * $Id: openpam_nullconv.c,v 1.5 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <sys/types.h>
--- a/dist/openpam/lib/openpam_readline.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_readline.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $
+ * $Id: openpam_readline.c,v 1.5 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <ctype.h>
@@ -52,7 +53,7 @@
 char *
 openpam_readline(FILE *f, int *lineno, size_t *lenp)
 {
-	unsigned char *line;
+	char *line;
 	size_t len, size;
 	int ch;
 
@@ -63,7 +64,7 @@
 
 #define line_putch(ch) do { \
 	if (len >= size - 1) { \
-		unsigned char *tmp = realloc(line, size *= 2); \
+		char *tmp = realloc(line, size *= 2); \
 		if (tmp == NULL) \
 			goto fail; \
 		line = tmp; \
--- a/dist/openpam/lib/openpam_restore_cred.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_restore_cred.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#11 $
+ * $Id: openpam_restore_cred.c,v 1.5 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <sys/param.h>
@@ -55,8 +56,8 @@
 int
 openpam_restore_cred(pam_handle_t *pamh)
 {
-	struct pam_saved_cred *scred;
-	void *scredp;
+	const struct pam_saved_cred *scred;
+	const void *scredp;
 	int r;
 
 	ENTER();
--- a/dist/openpam/lib/openpam_set_option.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_set_option.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_set_option.c#13 $
+ * $Id: openpam_set_option.c,v 1.3 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/openpam_static.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_static.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_static.c#6 $
+ * $Id: openpam_static.c,v 1.3 2008/01/27 01:22:59 christos Exp $
  */
 
 #include <string.h>
--- a/dist/openpam/lib/openpam_ttyconv.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/openpam_ttyconv.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#26 $
+ * $Id: openpam_ttyconv.c,v 1.11 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/types.h>
@@ -65,7 +66,7 @@
 {
 	char buf[PAM_MAX_RESP_SIZE];
 	struct sigaction action, saved_action;
-	sigset_t saved_sigs, sigs;
+	sigset_t saved_sigset, sigs;
 	unsigned int saved_alarm;
 	int eof, error, fd;
 	size_t len;
@@ -76,7 +77,7 @@
 	sigemptyset(&sigs);
 	sigaddset(&sigs, SIGINT);
 	sigaddset(&sigs, SIGTSTP);
-	sigprocmask(SIG_SETMASK, &sigs, &saved_sigs);
+	sigprocmask(SIG_SETMASK, &sigs, &saved_sigset);
 	action.sa_handler = &timeout;
 	action.sa_flags = 0;
 	sigemptyset(&action.sa_mask);
@@ -91,6 +92,7 @@
 	fd = fileno(infp);
 	buf[0] = '\0';
 	eof = error = 0;
+	saved_alarm = 0;
 	if (openpam_ttyconv_timeout >= 0)
 		saved_alarm = alarm((unsigned int)openpam_ttyconv_timeout);
 	ch = '\0';
@@ -113,8 +115,8 @@
 	if (openpam_ttyconv_timeout >= 0)
 		alarm(0);
 	sigaction(SIGALRM, &saved_action, NULL);
-	sigprocmask(SIG_SETMASK, &saved_sigs, NULL);
-	if (openpam_ttyconv_timeout >= 0)
+	sigprocmask(SIG_SETMASK, &saved_sigset, NULL);
+	if (saved_alarm > 0)
 		alarm(saved_alarm);
 	if (error == EINTR)
 		fputs(" timeout!", errfp);
--- a/dist/openpam/lib/pam_acct_mgmt.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_acct_mgmt.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#14 $
+ * $Id: pam_acct_mgmt.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_authenticate.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_authenticate.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_authenticate.c#15 $
+ * $Id: pam_authenticate.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_chauthtok.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_chauthtok.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#16 $
+ * $Id: pam_chauthtok.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_close_session.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_close_session.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_close_session.c#13 $
+ * $Id: pam_close_session.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_end.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_end.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_end.c#14 $
+ * $Id: pam_end.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_get_authtok.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_get_authtok.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#28 $
+ * $Id: pam_get_authtok.c,v 1.4 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_get_data.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_get_data.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_data.c#14 $
+ * $Id: pam_get_data.c,v 1.4 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <string.h>
@@ -48,9 +49,9 @@
  */
 
 int
-pam_get_data(pam_handle_t *pamh,
+pam_get_data(const pam_handle_t *pamh,
 	const char *module_data_name,
-	void **data)
+	const void **data)
 {
 	pam_data_t *dp;
 
--- a/dist/openpam/lib/pam_get_item.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_get_item.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_item.c#17 $
+ * $Id: pam_get_item.c,v 1.5 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +67,7 @@
  */
 
 int
-pam_get_item(pam_handle_t *pamh,
+pam_get_item(const pam_handle_t *pamh,
 	int item_type,
 	const void **item)
 {
--- a/dist/openpam/lib/pam_get_user.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_get_user.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_user.c#20 $
+ * $Id: pam_get_user.c,v 1.4 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_getenv.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_getenv.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_getenv.c#16 $
+ * $Id: pam_getenv.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_getenvlist.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_getenvlist.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#13 $
+ * $Id: pam_getenvlist.c,v 1.3 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_open_session.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_open_session.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_open_session.c#14 $
+ * $Id: pam_open_session.c,v 1.4 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_putenv.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_putenv.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_putenv.c#12 $
+ * $Id: pam_putenv.c,v 1.4 2008/01/27 01:23:00 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_set_data.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_set_data.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_set_data.c#15 $
+ * $Id: pam_set_data.c,v 1.4 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_set_item.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_set_item.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_set_item.c#21 $
+ * $Id: pam_set_item.c,v 1.5 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_setcred.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_setcred.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_setcred.c#14 $
+ * $Id: pam_setcred.c,v 1.3 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <sys/param.h>
--- a/dist/openpam/lib/pam_setenv.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_setenv.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_setenv.c#12 $
+ * $Id: pam_setenv.c,v 1.3 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_start.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_start.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_start.c#18 $
+ * $Id: pam_start.c,v 1.4 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <stdlib.h>
--- a/dist/openpam/lib/pam_strerror.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_strerror.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_strerror.c#13 $
+ * $Id: pam_strerror.c,v 1.4 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <stdio.h>
@@ -81,7 +82,7 @@
  */
 
 const char *
-pam_strerror(pam_handle_t *pamh,
+pam_strerror(const pam_handle_t *pamh,
 	int error_number)
 {
 	static char unknown[16];
--- a/dist/openpam/lib/pam_vprompt.c	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/lib/pam_vprompt.c	Sun Jan 27 01:22:55 2008 +0000
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2004-2007 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_vprompt.c#13 $
+ * $Id: pam_vprompt.c,v 1.4 2008/01/27 01:23:01 christos Exp $
  */
 
 #include <stdarg.h>
@@ -49,7 +50,7 @@
  */
 
 int
-pam_vprompt(pam_handle_t *pamh,
+pam_vprompt(const pam_handle_t *pamh,
 	int style,
 	char **resp,
 	const char *fmt,
--- a/dist/openpam/misc/gendoc.pl	Sun Jan 27 00:54:36 2008 +0000
+++ b/dist/openpam/misc/gendoc.pl	Sun Jan 27 01:22:55 2008 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 #-
 # Copyright (c) 2002-2003 Networks Associates Technology, Inc.
+# Copyright (c) 2004-2007 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -32,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/misc/gendoc.pl#30 $
+# $Id: gendoc.pl,v 1.5 2008/01/27 01:23:01 christos Exp $
 #
 
 use strict;
@@ -44,6 +45,7 @@
 
 $COPYRIGHT = ".\\\"-
 .\\\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
+.\\\" Copyright (c) 2004-2007 Dag-Erling Smørgrav
 .\\\" All rights reserved.
 .\\\"
 .\\\" This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -448,7 +450,7 @@
 function and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.\& under
+Security Research Division of Network Associates, Inc.\\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
@@ -562,7 +564,7 @@
 The OpenPAM library and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.\& under
+Security Research Division of Network Associates, Inc.\\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.