This commit was generated by cvs2svn to compensate for changes in r108794,

which included commits to RCS files with non-trunk default branches.

48 files changed, 112 insertions, 58 deletions

diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS
index 77ec7ce..43f0559 100644
--- a/contrib/openpam/CREDITS
+++ b/contrib/openpam/CREDITS
@@ -17,10 +17,12 @@ or indirectly, with patches, criticism, suggestions, or ideas:
 	Eric Melville <eric@freebsd.org>
 	Gary Winiger <Gary.Winiger@sun.com>
 	Joe Marcus Clarke <marcus@marcuscom.com>
+	Juli Mallett <jmallett@freebsd.org>
 	Mark Murray <markm@freebsd.org>
+	Mikko Työläjärvi <mbsd@pacbell.net>
 	Robert Watson <rwatson@freebsd.org>
 	Ruslan Ermilov <ru@freebsd.org>
 	Solar Designer <solar@openwall.com>
 	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
 
-$P4: //depot/projects/openpam/CREDITS#4 $
+$P4: //depot/projects/openpam/CREDITS#6 $
diff --git a/contrib/openpam/HISTORY b/contrib/openpam/HISTORY
index c16bcc4..70590de 100644
--- a/contrib/openpam/HISTORY
+++ b/contrib/openpam/HISTORY
@@ -1,3 +1,11 @@
+OpenPAM Daffodil						2003-01-06
+
+ - ENHANCE: Document dependency on <sys/types.h> (for size_t)
+
+ - ENHANCE: Slightly improve error detection in openpam_ttyconv().
+
+ - BUGFIX: Fix several typos in debugging macros.
+============================================================================
 OpenPAM Cyclamen						2002-12-12
 
  - ENHANCE: Improve recursion detection in openpam_dispatch().
@@ -198,4 +206,4 @@ OpenPAM	Calamite						2002-02-09
 
 First (beta) release.
 ============================================================================
-$P4: //depot/projects/openpam/HISTORY#16 $
+$P4: //depot/projects/openpam/HISTORY#17 $
diff --git a/contrib/openpam/RELNOTES b/contrib/openpam/RELNOTES
index 86a6988..5341949 100644
--- a/contrib/openpam/RELNOTES
+++ b/contrib/openpam/RELNOTES
@@ -1,7 +1,11 @@
 
-		  Release notes for OpenPAM Cyclamen
+		  Release notes for OpenPAM Daffodil
 		  ==================================
 
+This is a bugfix release.  The previous release, Cyclamen, was rushed
+out without sufficient testing, and contained a number of small but
+serious errors.
+
 This release corresponds to the code used in FreeBSD-CURRENT as of the
 release date.  It has also been successfully built on NetBSD 1.6, and
 should build with minimal or no changes on OpenBSD.  Work is underway
@@ -23,4 +27,4 @@ NOTE: to the person who sent me MacOS patches in July 2002: I have
 lost your name and email address.  Please contact me so I can give you
 proper credit for your contribution.
 
-$P4: //depot/projects/openpam/RELNOTES#13 $
+$P4: //depot/projects/openpam/RELNOTES#14 $
diff --git a/contrib/openpam/doc/man/openpam.3 b/contrib/openpam/doc/man/openpam.3
index 4d5bc08..e56caee 100644
--- a/contrib/openpam/doc/man/openpam.3
+++ b/contrib/openpam/doc/man/openpam.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/openpam_borrow_cred.3 b/contrib/openpam/doc/man/openpam_borrow_cred.3
index 8da6c55..cf9b51a 100644
--- a/contrib/openpam/doc/man/openpam_borrow_cred.3
+++ b/contrib/openpam/doc/man/openpam_borrow_cred.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_BORROW_CRED 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft int
diff --git a/contrib/openpam/doc/man/openpam_free_data.3 b/contrib/openpam/doc/man/openpam_free_data.3
index 43da4e9..b833f68 100644
--- a/contrib/openpam/doc/man/openpam_free_data.3
+++ b/contrib/openpam/doc/man/openpam_free_data.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_FREE_DATA 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft void
diff --git a/contrib/openpam/doc/man/openpam_get_option.3 b/contrib/openpam/doc/man/openpam_get_option.3
index 5682fa0..f6cf8c0 100644
--- a/contrib/openpam/doc/man/openpam_get_option.3
+++ b/contrib/openpam/doc/man/openpam_get_option.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_GET_OPTION 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft const char *
diff --git a/contrib/openpam/doc/man/openpam_log.3 b/contrib/openpam/doc/man/openpam_log.3
index 33847dc..be271e8 100644
--- a/contrib/openpam/doc/man/openpam_log.3
+++ b/contrib/openpam/doc/man/openpam_log.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_LOG 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft void
diff --git a/contrib/openpam/doc/man/openpam_nullconv.3 b/contrib/openpam/doc/man/openpam_nullconv.3
index c63c459..6a286b7 100644
--- a/contrib/openpam/doc/man/openpam_nullconv.3
+++ b/contrib/openpam/doc/man/openpam_nullconv.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_NULLCONV 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft int
diff --git a/contrib/openpam/doc/man/openpam_restore_cred.3 b/contrib/openpam/doc/man/openpam_restore_cred.3
index c02024b..af9915b 100644
--- a/contrib/openpam/doc/man/openpam_restore_cred.3
+++ b/contrib/openpam/doc/man/openpam_restore_cred.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_RESTORE_CRED 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft int
diff --git a/contrib/openpam/doc/man/openpam_set_option.3 b/contrib/openpam/doc/man/openpam_set_option.3
index 8850fa3..2ede046 100644
--- a/contrib/openpam/doc/man/openpam_set_option.3
+++ b/contrib/openpam/doc/man/openpam_set_option.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_SET_OPTION 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft int
diff --git a/contrib/openpam/doc/man/openpam_ttyconv.3 b/contrib/openpam/doc/man/openpam_ttyconv.3
index 63c6078..d79a5c7 100644
--- a/contrib/openpam/doc/man/openpam_ttyconv.3
+++ b/contrib/openpam/doc/man/openpam_ttyconv.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt OPENPAM_TTYCONV 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam.3 b/contrib/openpam/doc/man/pam.3
index 564565f..a65e86a 100644
--- a/contrib/openpam/doc/man/pam.3
+++ b/contrib/openpam/doc/man/pam.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM 3
 .Os
 .Sh NAME
diff --git a/contrib/openpam/doc/man/pam_acct_mgmt.3 b/contrib/openpam/doc/man/pam_acct_mgmt.3
index 00ccd74..cd95c40 100644
--- a/contrib/openpam/doc/man/pam_acct_mgmt.3
+++ b/contrib/openpam/doc/man/pam_acct_mgmt.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_ACCT_MGMT 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags"
diff --git a/contrib/openpam/doc/man/pam_authenticate.3 b/contrib/openpam/doc/man/pam_authenticate.3
index 0412841..34a2918 100644
--- a/contrib/openpam/doc/man/pam_authenticate.3
+++ b/contrib/openpam/doc/man/pam_authenticate.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_AUTHENTICATE 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_authenticate "pam_handle_t *pamh" "int flags"
diff --git a/contrib/openpam/doc/man/pam_chauthtok.3 b/contrib/openpam/doc/man/pam_chauthtok.3
index 247578c..6a16756 100644
--- a/contrib/openpam/doc/man/pam_chauthtok.3
+++ b/contrib/openpam/doc/man/pam_chauthtok.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_CHAUTHTOK 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_chauthtok "pam_handle_t *pamh" "int flags"
diff --git a/contrib/openpam/doc/man/pam_close_session.3 b/contrib/openpam/doc/man/pam_close_session.3
index 7ad1c6b..5d0b37a 100644
--- a/contrib/openpam/doc/man/pam_close_session.3
+++ b/contrib/openpam/doc/man/pam_close_session.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_CLOSE_SESSION 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_close_session "pam_handle_t *pamh" "int flags"
diff --git a/contrib/openpam/doc/man/pam_end.3 b/contrib/openpam/doc/man/pam_end.3
index 25a6df2..b1734d6 100644
--- a/contrib/openpam/doc/man/pam_end.3
+++ b/contrib/openpam/doc/man/pam_end.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_END 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_end "pam_handle_t *pamh" "int status"
diff --git a/contrib/openpam/doc/man/pam_error.3 b/contrib/openpam/doc/man/pam_error.3
index 8d4be29..f7e9c50 100644
--- a/contrib/openpam/doc/man/pam_error.3
+++ b/contrib/openpam/doc/man/pam_error.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_ERROR 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..."
diff --git a/contrib/openpam/doc/man/pam_get_authtok.3 b/contrib/openpam/doc/man/pam_get_authtok.3
index b8d67be..431b77d 100644
--- a/contrib/openpam/doc/man/pam_get_authtok.3
+++ b/contrib/openpam/doc/man/pam_get_authtok.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_GET_AUTHTOK 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt"
diff --git a/contrib/openpam/doc/man/pam_get_data.3 b/contrib/openpam/doc/man/pam_get_data.3
index db29446..3ca9163 100644
--- a/contrib/openpam/doc/man/pam_get_data.3
+++ b/contrib/openpam/doc/man/pam_get_data.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_GET_DATA 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "const void **data"
diff --git a/contrib/openpam/doc/man/pam_get_item.3 b/contrib/openpam/doc/man/pam_get_item.3
index 472d099..d66401d 100644
--- a/contrib/openpam/doc/man/pam_get_item.3
+++ b/contrib/openpam/doc/man/pam_get_item.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_GET_ITEM 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.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"
diff --git a/contrib/openpam/doc/man/pam_get_user.3 b/contrib/openpam/doc/man/pam_get_user.3
index 05d9452..9bb8f96 100644
--- a/contrib/openpam/doc/man/pam_get_user.3
+++ b/contrib/openpam/doc/man/pam_get_user.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_GET_USER 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt"
diff --git a/contrib/openpam/doc/man/pam_getenv.3 b/contrib/openpam/doc/man/pam_getenv.3
index 17cba6b..6fad6b1 100644
--- a/contrib/openpam/doc/man/pam_getenv.3
+++ b/contrib/openpam/doc/man/pam_getenv.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_GETENV 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft char *
 .Fn pam_getenv "pam_handle_t *pamh" "const char *name"
diff --git a/contrib/openpam/doc/man/pam_getenvlist.3 b/contrib/openpam/doc/man/pam_getenvlist.3
index 7520795..c9ff4c5 100644
--- a/contrib/openpam/doc/man/pam_getenvlist.3
+++ b/contrib/openpam/doc/man/pam_getenvlist.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_GETENVLIST 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft char **
 .Fn pam_getenvlist "pam_handle_t *pamh"
diff --git a/contrib/openpam/doc/man/pam_info.3 b/contrib/openpam/doc/man/pam_info.3
index cdbb13c..16495e1 100644
--- a/contrib/openpam/doc/man/pam_info.3
+++ b/contrib/openpam/doc/man/pam_info.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_INFO 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_info "pam_handle_t *pamh" "const char *fmt" "..."
diff --git a/contrib/openpam/doc/man/pam_open_session.3 b/contrib/openpam/doc/man/pam_open_session.3
index 2904027..638a7ef 100644
--- a/contrib/openpam/doc/man/pam_open_session.3
+++ b/contrib/openpam/doc/man/pam_open_session.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_OPEN_SESSION 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_open_session "pam_handle_t *pamh" "int flags"
diff --git a/contrib/openpam/doc/man/pam_prompt.3 b/contrib/openpam/doc/man/pam_prompt.3
index b3fa819..3783e21 100644
--- a/contrib/openpam/doc/man/pam_prompt.3
+++ b/contrib/openpam/doc/man/pam_prompt.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_PROMPT 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.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" "..."
diff --git a/contrib/openpam/doc/man/pam_putenv.3 b/contrib/openpam/doc/man/pam_putenv.3
index b889555..efb1e91 100644
--- a/contrib/openpam/doc/man/pam_putenv.3
+++ b/contrib/openpam/doc/man/pam_putenv.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_PUTENV 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_putenv "pam_handle_t *pamh" "const char *namevalue"
diff --git a/contrib/openpam/doc/man/pam_set_data.3 b/contrib/openpam/doc/man/pam_set_data.3
index d223052..955b42b 100644
--- a/contrib/openpam/doc/man/pam_set_data.3
+++ b/contrib/openpam/doc/man/pam_set_data.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SET_DATA 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_set_data "pam_handle_t *pamh" "const char *module_data_name" "void *data" "void (*cleanup)(pam_handle_t *pamh, void *data, int pam_end_status)"
diff --git a/contrib/openpam/doc/man/pam_set_item.3 b/contrib/openpam/doc/man/pam_set_item.3
index 6e43f93..ccdf660 100644
--- a/contrib/openpam/doc/man/pam_set_item.3
+++ b/contrib/openpam/doc/man/pam_set_item.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SET_ITEM 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_set_item "pam_handle_t *pamh" "int item_type" "const void *item"
diff --git a/contrib/openpam/doc/man/pam_setcred.3 b/contrib/openpam/doc/man/pam_setcred.3
index b35de13..0cf40dc 100644
--- a/contrib/openpam/doc/man/pam_setcred.3
+++ b/contrib/openpam/doc/man/pam_setcred.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SETCRED 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_setcred "pam_handle_t *pamh" "int flags"
diff --git a/contrib/openpam/doc/man/pam_setenv.3 b/contrib/openpam/doc/man/pam_setenv.3
index 2ea18ef..8ae8e0f 100644
--- a/contrib/openpam/doc/man/pam_setenv.3
+++ b/contrib/openpam/doc/man/pam_setenv.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SETENV 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_setenv "pam_handle_t *pamh" "const char *name" "const char *value" "int overwrite"
diff --git a/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 b/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
index 19f7acb..c00b4ef 100644
--- a/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
+++ b/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SM_ACCT_MGMT 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam_sm_authenticate.3 b/contrib/openpam/doc/man/pam_sm_authenticate.3
index 168e17f..9dcb8d6 100644
--- a/contrib/openpam/doc/man/pam_sm_authenticate.3
+++ b/contrib/openpam/doc/man/pam_sm_authenticate.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SM_AUTHENTICATE 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam_sm_chauthtok.3 b/contrib/openpam/doc/man/pam_sm_chauthtok.3
index 9d0f11f..0af4717 100644
--- a/contrib/openpam/doc/man/pam_sm_chauthtok.3
+++ b/contrib/openpam/doc/man/pam_sm_chauthtok.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SM_CHAUTHTOK 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam_sm_close_session.3 b/contrib/openpam/doc/man/pam_sm_close_session.3
index 7879375..e1511aa 100644
--- a/contrib/openpam/doc/man/pam_sm_close_session.3
+++ b/contrib/openpam/doc/man/pam_sm_close_session.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SM_CLOSE_SESSION 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam_sm_open_session.3 b/contrib/openpam/doc/man/pam_sm_open_session.3
index 33ff290..1b5183e 100644
--- a/contrib/openpam/doc/man/pam_sm_open_session.3
+++ b/contrib/openpam/doc/man/pam_sm_open_session.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SM_OPEN_SESSION 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam_sm_setcred.3 b/contrib/openpam/doc/man/pam_sm_setcred.3
index 217b1dd..f72b77d 100644
--- a/contrib/openpam/doc/man/pam_sm_setcred.3
+++ b/contrib/openpam/doc/man/pam_sm_setcred.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_SM_SETCRED 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft int
diff --git a/contrib/openpam/doc/man/pam_start.3 b/contrib/openpam/doc/man/pam_start.3
index d40f00d..a2a1584 100644
--- a/contrib/openpam/doc/man/pam_start.3
+++ b/contrib/openpam/doc/man/pam_start.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_START 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_start "const char *service" "const char *user" "const struct pam_conv *pam_conv" "pam_handle_t **pamh"
diff --git a/contrib/openpam/doc/man/pam_strerror.3 b/contrib/openpam/doc/man/pam_strerror.3
index d1c1558..cce60cf 100644
--- a/contrib/openpam/doc/man/pam_strerror.3
+++ b/contrib/openpam/doc/man/pam_strerror.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_STRERROR 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft const char *
 .Fn pam_strerror "pam_handle_t *pamh" "int error_number"
diff --git a/contrib/openpam/doc/man/pam_verror.3 b/contrib/openpam/doc/man/pam_verror.3
index d11adbb..a4b16ea 100644
--- a/contrib/openpam/doc/man/pam_verror.3
+++ b/contrib/openpam/doc/man/pam_verror.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_VERROR 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_verror "pam_handle_t *pamh" "const char *fmt" "va_list ap"
diff --git a/contrib/openpam/doc/man/pam_vinfo.3 b/contrib/openpam/doc/man/pam_vinfo.3
index 278126c..f10c4ec 100644
--- a/contrib/openpam/doc/man/pam_vinfo.3
+++ b/contrib/openpam/doc/man/pam_vinfo.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_VINFO 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 .Ft int
 .Fn pam_vinfo "pam_handle_t *pamh" "const char *fmt" "va_list ap"
diff --git a/contrib/openpam/doc/man/pam_vprompt.3 b/contrib/openpam/doc/man/pam_vprompt.3
index 8e7a5e6..e855a5e 100644
--- a/contrib/openpam/doc/man/pam_vprompt.3
+++ b/contrib/openpam/doc/man/pam_vprompt.3
@@ -33,7 +33,7 @@
 .\"
 .\" $P4$
 .\"
-.Dd December 12, 2002
+.Dd January 6, 2003
 .Dt PAM_VPROMPT 3
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.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"
diff --git a/contrib/openpam/lib/openpam_impl.h b/contrib/openpam/lib/openpam_impl.h
index 96e3b7b..87818b6 100644
--- a/contrib/openpam/lib/openpam_impl.h
+++ b/contrib/openpam/lib/openpam_impl.h
@@ -31,7 +31,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#18 $
+ * $P4: //depot/projects/openpam/lib/openpam_impl.h#19 $
  */
 
 #ifndef _OPENPAM_IMPL_H_INCLUDED
@@ -125,15 +125,15 @@ pam_module_t   *openpam_dynamic(const char *);
 #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering")
 #define	RETURNV() openpam_log(PAM_LOG_DEBUG, "returning")
 #define RETURNC(c) do { \
-	if ((c) >= 0 && (c) < PAM_NUM_ERRORS)
+	if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \
 		openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[c]); \
 	else \
 		openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \
 	return (c); \
 } while (0)
-#define	RETURNI(n) do { \
-	openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \
-	return (n); \
+#define	RETURNI(i) do { \
+	openpam_log(PAM_LOG_DEBUG, "returning %d", (i)); \
+	return (i); \
 } while (0)
 #define	RETURNP(p) do { \
 	if ((p) == NULL) \
diff --git a/contrib/openpam/lib/openpam_ttyconv.c b/contrib/openpam/lib/openpam_ttyconv.c
index d3fdde1..828f359 100644
--- a/contrib/openpam/lib/openpam_ttyconv.c
+++ b/contrib/openpam/lib/openpam_ttyconv.c
@@ -31,7 +31,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#14 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#15 $
  */
 
 #include <sys/types.h>
@@ -89,7 +89,7 @@ prompt(const char *msg)
 	sigaction(SIGALRM, &saved_action, NULL);
 	sigprocmask(SIG_SETMASK, &saved_sigset, NULL);
 	alarm(saved_alarm);
-	if (timed_out || ferror(stdin))
+	if (timed_out || ferror(stdin) || feof(stdin))
 		return (NULL);
 	/* trim trailing whitespace */
 	for (len = strlen(buf); len > 0; --len)
diff --git a/contrib/openpam/lib/pam_getenv.c b/contrib/openpam/lib/pam_getenv.c
index 1b4fd15..a00c7cf 100644
--- a/contrib/openpam/lib/pam_getenv.c
+++ b/contrib/openpam/lib/pam_getenv.c
@@ -31,7 +31,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#8 $
+ * $P4: //depot/projects/openpam/lib/pam_getenv.c#10 $
  */
 
 #include <stdlib.h>
@@ -56,12 +56,12 @@ pam_getenv(pam_handle_t *pamh,
 
 	ENTER();
 	if (pamh == NULL)
-		RETURNC(NULL);
+		RETURNS(NULL);
 	if (name == NULL || strchr(name, '=') != NULL)
-		RETURNC(NULL);
+		RETURNS(NULL);
 	if ((i = openpam_findenv(pamh, name, strlen(name))) == -1)
-		RETURNC(NULL);
-	RETURNC(strdup(pamh->env[i]));
+		RETURNS(NULL);
+	RETURNS(strdup(pamh->env[i]));
 }
 
 /**
diff --git a/contrib/openpam/misc/gendoc.pl b/contrib/openpam/misc/gendoc.pl
index b22468f..3d29f0e 100644
--- a/contrib/openpam/misc/gendoc.pl
+++ b/contrib/openpam/misc/gendoc.pl
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/misc/gendoc.pl#18 $
+# $P4: //depot/projects/openpam/misc/gendoc.pl#19 $
 #
 
 use strict;
@@ -355,6 +355,7 @@ sub gendoc($) {
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
+.In sys/types.h
 .In security/pam_appl.h
 ";
     if ($func->{'name'} =~ m/_sm_/) {