d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vendor import of OpenPAM Daffodil.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2003-01-06 16:07:51 +00:00
parent 70e94b0be1
commit 644f2b7cdc
48 changed files with 112 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/openpam/CREDITS
View File

@ -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 $

10
contrib/openpam/HISTORY
View File

@ -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 $

8
contrib/openpam/RELNOTES
View File

@ -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 $

2
contrib/openpam/doc/man/openpam.3
View File

@ -33,7 +33,7 @@
.\"
.\" $P4$
.\"
.Dd December 12, 2002
.Dd January 6, 2003
.Dt OPENPAM 3
.Os
.Sh NAME

3
contrib/openpam/doc/man/openpam_borrow_cred.3
View File

@ -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

3
contrib/openpam/doc/man/openpam_free_data.3
View File

@ -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

3
contrib/openpam/doc/man/openpam_get_option.3
View File

@ -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 *

3
contrib/openpam/doc/man/openpam_log.3
View File

@ -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

3
contrib/openpam/doc/man/openpam_nullconv.3
View File

@ -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

3
contrib/openpam/doc/man/openpam_restore_cred.3
View File

@ -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

3
contrib/openpam/doc/man/openpam_set_option.3
View File

@ -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

3
contrib/openpam/doc/man/openpam_ttyconv.3
View File

@ -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

2
contrib/openpam/doc/man/pam.3
View File

@ -33,7 +33,7 @@
.\"
.\" $P4$
.\"
.Dd December 12, 2002
.Dd January 6, 2003
.Dt PAM 3
.Os
.Sh NAME

3
contrib/openpam/doc/man/pam_acct_mgmt.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_authenticate.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_chauthtok.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_close_session.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_end.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_error.3
View File

@ -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" "..."

3
contrib/openpam/doc/man/pam_get_authtok.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_get_data.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_get_item.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_get_user.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_getenv.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_getenvlist.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_info.3
View File

@ -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" "..."

3
contrib/openpam/doc/man/pam_open_session.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_prompt.3
View File

@ -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" "..."

3
contrib/openpam/doc/man/pam_putenv.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_set_data.3
View File

@ -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)"

3
contrib/openpam/doc/man/pam_set_item.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_setcred.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_setenv.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_sm_acct_mgmt.3
View File

@ -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

3
contrib/openpam/doc/man/pam_sm_authenticate.3
View File

@ -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

3
contrib/openpam/doc/man/pam_sm_chauthtok.3
View File

@ -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

3
contrib/openpam/doc/man/pam_sm_close_session.3
View File

@ -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

3
contrib/openpam/doc/man/pam_sm_open_session.3
View File

@ -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

3
contrib/openpam/doc/man/pam_sm_setcred.3
View File

@ -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

3
contrib/openpam/doc/man/pam_start.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_strerror.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_verror.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_vinfo.3
View File

@ -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"

3
contrib/openpam/doc/man/pam_vprompt.3
View File

@ -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"

10
contrib/openpam/lib/openpam_impl.h
View File

@ -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) \

4
contrib/openpam/lib/openpam_ttyconv.c
View File

@ -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)

10
contrib/openpam/lib/pam_getenv.c
View File

@ -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]));
}
/**

3
contrib/openpam/misc/gendoc.pl
View File

@ -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_/) {