aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2003-01-06 16:07:51 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2003-01-06 16:07:51 +0000
commit644f2b7cdc7b03626cfaa28ce0e77dc65d779b01 (patch)
tree4e046ed575c1daa1c1da9f3cda1590f860a5ca1c
parent70e94b0be1607d23eaad7e884a41d166240c4c00 (diff)
downloadsrc-644f2b7cdc7b03626cfaa28ce0e77dc65d779b01.tar.gz
src-644f2b7cdc7b03626cfaa28ce0e77dc65d779b01.zip
Vendor import of OpenPAM Daffodil.
Notes
Notes: svn path=/vendor/openpam/dist/; revision=108794
-rw-r--r--contrib/openpam/CREDITS4
-rw-r--r--contrib/openpam/HISTORY10
-rw-r--r--contrib/openpam/RELNOTES8
-rw-r--r--contrib/openpam/doc/man/openpam.32
-rw-r--r--contrib/openpam/doc/man/openpam_borrow_cred.33
-rw-r--r--contrib/openpam/doc/man/openpam_free_data.33
-rw-r--r--contrib/openpam/doc/man/openpam_get_option.33
-rw-r--r--contrib/openpam/doc/man/openpam_log.33
-rw-r--r--contrib/openpam/doc/man/openpam_nullconv.33
-rw-r--r--contrib/openpam/doc/man/openpam_restore_cred.33
-rw-r--r--contrib/openpam/doc/man/openpam_set_option.33
-rw-r--r--contrib/openpam/doc/man/openpam_ttyconv.33
-rw-r--r--contrib/openpam/doc/man/pam.32
-rw-r--r--contrib/openpam/doc/man/pam_acct_mgmt.33
-rw-r--r--contrib/openpam/doc/man/pam_authenticate.33
-rw-r--r--contrib/openpam/doc/man/pam_chauthtok.33
-rw-r--r--contrib/openpam/doc/man/pam_close_session.33
-rw-r--r--contrib/openpam/doc/man/pam_end.33
-rw-r--r--contrib/openpam/doc/man/pam_error.33
-rw-r--r--contrib/openpam/doc/man/pam_get_authtok.33
-rw-r--r--contrib/openpam/doc/man/pam_get_data.33
-rw-r--r--contrib/openpam/doc/man/pam_get_item.33
-rw-r--r--contrib/openpam/doc/man/pam_get_user.33
-rw-r--r--contrib/openpam/doc/man/pam_getenv.33
-rw-r--r--contrib/openpam/doc/man/pam_getenvlist.33
-rw-r--r--contrib/openpam/doc/man/pam_info.33
-rw-r--r--contrib/openpam/doc/man/pam_open_session.33
-rw-r--r--contrib/openpam/doc/man/pam_prompt.33
-rw-r--r--contrib/openpam/doc/man/pam_putenv.33
-rw-r--r--contrib/openpam/doc/man/pam_set_data.33
-rw-r--r--contrib/openpam/doc/man/pam_set_item.33
-rw-r--r--contrib/openpam/doc/man/pam_setcred.33
-rw-r--r--contrib/openpam/doc/man/pam_setenv.33
-rw-r--r--contrib/openpam/doc/man/pam_sm_acct_mgmt.33
-rw-r--r--contrib/openpam/doc/man/pam_sm_authenticate.33
-rw-r--r--contrib/openpam/doc/man/pam_sm_chauthtok.33
-rw-r--r--contrib/openpam/doc/man/pam_sm_close_session.33
-rw-r--r--contrib/openpam/doc/man/pam_sm_open_session.33
-rw-r--r--contrib/openpam/doc/man/pam_sm_setcred.33
-rw-r--r--contrib/openpam/doc/man/pam_start.33
-rw-r--r--contrib/openpam/doc/man/pam_strerror.33
-rw-r--r--contrib/openpam/doc/man/pam_verror.33
-rw-r--r--contrib/openpam/doc/man/pam_vinfo.33
-rw-r--r--contrib/openpam/doc/man/pam_vprompt.33
-rw-r--r--contrib/openpam/lib/openpam_impl.h10
-rw-r--r--contrib/openpam/lib/openpam_ttyconv.c4
-rw-r--r--contrib/openpam/lib/pam_getenv.c10
-rw-r--r--contrib/openpam/misc/gendoc.pl3
48 files changed, 112 insertions, 58 deletions
diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS
index 77ec7cebb3f1..43f05597abce 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 Tyljrvi <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 c16bcc48e830..70590defcb4f 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 86a69884e874..5341949a57e3 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 4d5bc08237b5..e56caee6d8f8 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 8da6c55c3592..cf9b51aaa0d4 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 43da4e94873e..b833f6815bf0 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 5682fa09c43a..f6cf8c0bf819 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 33847dc061aa..be271e8598bd 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 c63c459c1412..6a286b7412f1 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 c02024b79e28..af9915b5f794 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 8850fa3461cd..2ede046e59cf 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 63c6078404ef..d79a5c79f315 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 564565faa264..a65e86a9c1aa 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 00ccd745fcb7..cd95c40d6dcd 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 04128415a41c..34a29188156d 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 247578c2a0b1..6a16756a4688 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 7ad1c6be7306..5d0b37ae1be9 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 25a6df2126d8..b1734d61c15b 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 8d4be299af4a..f7e9c50fc652 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 b8d67be773f0..431b77d20bd6 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 db294466d51d..3ca9163ee502 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 472d09936e89..d66401d2700d 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 05d9452e81e8..9bb8f9658177 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 17cba6bb149c..6fad6b1fca2b 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 7520795eac24..c9ff4c56523e 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 cdbb13c49d2e..16495e1665e9 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 290402712ad7..638a7ef75b90 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 b3fa81958ba5..3783e21383f1 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 b889555dca02..efb1e913d6fc 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 d22305262f2a..955b42bf5e85 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 6e43f9378aa9..ccdf660df6c8 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 b35de1398549..0cf40dc87259 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 2ea18efae88e..8ae8e0f030d9 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 19f7acb9f6f3..c00b4effac26 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 168e17f43840..9dcb8d6e3013 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 9d0f11fe5fb6..0af47171e2c0 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 7879375f2e4d..e1511aaa82fd 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 33ff290670f0..1b5183ecaf35 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 217b1ddc7584..f72b77dc457a 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 d40f00dcc393..a2a15847b7ec 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 d1c1558d6936..cce60cf21e4f 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 d11adbbd1893..a4b16ea0967f 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 278126ca5b8b..f10c4ec84da3 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 8e7a5e686bcc..e855a5e7310c 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 96e3b7ba715e..87818b660aa9 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 d3fdde16a4b8..828f359950dd 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 1b4fd15eea3b..a00c7cf4e404 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 b22468f686bc..3d29f0e875db 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_/) {