Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/openpam/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/b405f89792d7
branches: trunk
changeset: 353430:b405f89792d7
user: christos <christos%NetBSD.org@localhost>
date: Sat May 06 19:50:09 2017 +0000
description:
merge conflicts
diffstat:
external/bsd/openpam/dist/bin/pamtest/pamtest.1 | 8 +-
external/bsd/openpam/dist/bin/pamtest/pamtest.c | 4 +-
external/bsd/openpam/dist/bin/su/su.1 | 8 +-
external/bsd/openpam/dist/bin/su/su.c | 4 +-
external/bsd/openpam/dist/doc/man/openpam.3 | 103 +++-
external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 | 12 +-
external/bsd/openpam/dist/doc/man/openpam_free_data.3 | 10 +-
external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 | 8 +-
external/bsd/openpam/dist/doc/man/openpam_get_feature.3 | 14 +-
external/bsd/openpam/dist/doc/man/openpam_get_option.3 | 10 +-
external/bsd/openpam/dist/doc/man/openpam_log.3 | 10 +-
external/bsd/openpam/dist/doc/man/openpam_nullconv.3 | 12 +-
external/bsd/openpam/dist/doc/man/openpam_readline.3 | 10 +-
external/bsd/openpam/dist/doc/man/openpam_readlinev.3 | 8 +-
external/bsd/openpam/dist/doc/man/openpam_readword.3 | 8 +-
external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 | 12 +-
external/bsd/openpam/dist/doc/man/openpam_set_feature.3 | 14 +-
external/bsd/openpam/dist/doc/man/openpam_set_option.3 | 12 +-
external/bsd/openpam/dist/doc/man/openpam_straddch.3 | 8 +-
external/bsd/openpam/dist/doc/man/openpam_subst.3 | 14 +-
external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam.3 | 85 ++-
external/bsd/openpam/dist/doc/man/pam.conf.5 | 8 +-
external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_authenticate.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_chauthtok.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_close_session.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_conv.3 | 8 +-
external/bsd/openpam/dist/doc/man/pam_end.3 | 16 +-
external/bsd/openpam/dist/doc/man/pam_error.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_get_authtok.3 | 16 +-
external/bsd/openpam/dist/doc/man/pam_get_data.3 | 14 +-
external/bsd/openpam/dist/doc/man/pam_get_item.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_get_user.3 | 14 +-
external/bsd/openpam/dist/doc/man/pam_getenv.3 | 10 +-
external/bsd/openpam/dist/doc/man/pam_getenvlist.3 | 10 +-
external/bsd/openpam/dist/doc/man/pam_info.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_open_session.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_prompt.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_putenv.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_set_data.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_set_item.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_setcred.3 | 18 +-
external/bsd/openpam/dist/doc/man/pam_setenv.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_start.3 | 14 +-
external/bsd/openpam/dist/doc/man/pam_strerror.3 | 10 +-
external/bsd/openpam/dist/doc/man/pam_verror.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_vinfo.3 | 12 +-
external/bsd/openpam/dist/doc/man/pam_vprompt.3 | 12 +-
external/bsd/openpam/dist/include/security/openpam.h | 7 +-
external/bsd/openpam/dist/include/security/openpam_attr.h | 4 +-
external/bsd/openpam/dist/include/security/openpam_version.h | 10 +-
external/bsd/openpam/dist/include/security/pam_appl.h | 6 +-
external/bsd/openpam/dist/include/security/pam_constants.h | 10 +-
external/bsd/openpam/dist/include/security/pam_modules.h | 4 +-
external/bsd/openpam/dist/include/security/pam_types.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_asprintf.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_asprintf.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_borrow_cred.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_check_owner_perms.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_configure.c | 18 +-
external/bsd/openpam/dist/lib/libpam/openpam_constants.c | 180 +++--
external/bsd/openpam/dist/lib/libpam/openpam_constants.h | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_cred.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_ctype.h | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_debug.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_dispatch.c | 18 +-
external/bsd/openpam/dist/lib/libpam/openpam_dlfunc.h | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_dynamic.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_features.c | 13 +-
external/bsd/openpam/dist/lib/libpam/openpam_features.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_findenv.c | 16 +-
external/bsd/openpam/dist/lib/libpam/openpam_free_data.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_free_envlist.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_get_feature.c | 12 +-
external/bsd/openpam/dist/lib/libpam/openpam_get_option.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_impl.h | 45 +-
external/bsd/openpam/dist/lib/libpam/openpam_load.c | 10 +-
external/bsd/openpam/dist/lib/libpam/openpam_log.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_nullconv.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_readline.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_readlinev.c | 10 +-
external/bsd/openpam/dist/lib/libpam/openpam_readword.c | 10 +-
external/bsd/openpam/dist/lib/libpam/openpam_restore_cred.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_set_feature.c | 12 +-
external/bsd/openpam/dist/lib/libpam/openpam_set_option.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_static.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_straddch.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlcat.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlcat.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlcmp.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlcpy.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlcpy.h | 4 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlset.c | 8 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlset.h | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_subst.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_ttyconv.c | 8 +-
external/bsd/openpam/dist/lib/libpam/openpam_vasprintf.c | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_vasprintf.h | 4 +-
external/bsd/openpam/dist/lib/libpam/pam_acct_mgmt.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_authenticate.c | 14 +-
external/bsd/openpam/dist/lib/libpam/pam_authenticate_secondary.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_chauthtok.c | 14 +-
external/bsd/openpam/dist/lib/libpam/pam_close_session.c | 14 +-
external/bsd/openpam/dist/lib/libpam/pam_end.c | 12 +-
external/bsd/openpam/dist/lib/libpam/pam_error.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_get_authtok.c | 19 +-
external/bsd/openpam/dist/lib/libpam/pam_get_data.c | 11 +-
external/bsd/openpam/dist/lib/libpam/pam_get_item.c | 15 +-
external/bsd/openpam/dist/lib/libpam/pam_get_mapped_authtok.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_get_mapped_username.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_get_user.c | 17 +-
external/bsd/openpam/dist/lib/libpam/pam_getenv.c | 23 +-
external/bsd/openpam/dist/lib/libpam/pam_getenvlist.c | 14 +-
external/bsd/openpam/dist/lib/libpam/pam_info.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_open_session.c | 14 +-
external/bsd/openpam/dist/lib/libpam/pam_prompt.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_putenv.c | 22 +-
external/bsd/openpam/dist/lib/libpam/pam_set_data.c | 10 +-
external/bsd/openpam/dist/lib/libpam/pam_set_item.c | 30 +-
external/bsd/openpam/dist/lib/libpam/pam_set_mapped_authtok.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_set_mapped_username.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_setcred.c | 14 +-
external/bsd/openpam/dist/lib/libpam/pam_setenv.c | 15 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_acct_mgmt.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_authenticate.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_authenticate_secondary.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_chauthtok.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_close_session.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_get_mapped_authtok.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_get_mapped_username.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_open_session.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_set_mapped_authtok.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_set_mapped_username.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_sm_setcred.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_start.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_strerror.c | 74 +--
external/bsd/openpam/dist/lib/libpam/pam_verror.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_vinfo.c | 6 +-
external/bsd/openpam/dist/lib/libpam/pam_vprompt.c | 6 +-
external/bsd/openpam/dist/misc/gendoc.pl | 76 +-
external/bsd/openpam/dist/modules/pam_deny/pam_deny.c | 4 +-
external/bsd/openpam/dist/modules/pam_permit/pam_permit.c | 4 +-
external/bsd/openpam/dist/modules/pam_unix/pam_unix.c | 10 +-
external/bsd/openpam/dist/pamgdb.in | 41 -
external/bsd/openpam/dist/t/t.h | 83 --
external/bsd/openpam/dist/t/t_file.c | 160 -----
external/bsd/openpam/dist/t/t_main.c | 127 ----
external/bsd/openpam/dist/t/t_openpam_readlinev.c | 133 ++-
external/bsd/openpam/dist/t/t_openpam_readword.c | 291 ++++++---
156 files changed, 1340 insertions(+), 1460 deletions(-)
diffs (truncated from 6872 to 300 lines):
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/bin/pamtest/pamtest.1
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Sat May 06 19:50:09 2017 +0000
@@ -1,7 +1,7 @@
-.\" $NetBSD: pamtest.1,v 1.7 2014/10/24 18:27:12 christos Exp $
+.\" $NetBSD: pamtest.1,v 1.8 2017/05/06 19:50:09 christos Exp $
.\"
.\"-
-.\" Copyright (c) 2011 Dag-Erling Smørgrav
+.\" Copyright (c) 2011-2017 Dag-Erling Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Id: pamtest.1 816 2014-09-12 07:50:22Z des
+.\" $OpenPAM: pamtest.1 939 2017-04-30 21:36:50Z des $
.\"
-.Dd September 12, 2014
+.Dd April 30, 2017
.Dt PAMTEST 1
.Os
.Sh NAME
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/bin/pamtest/pamtest.c
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.c Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.c Sat May 06 19:50:09 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pamtest.c,v 1.6 2014/10/24 18:27:12 christos Exp $ */
+/* $NetBSD: pamtest.c,v 1.7 2017/05/06 19:50:09 christos Exp $ */
/*-
* Copyright (c) 2011 Dag-Erling Smørgrav
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * Id: pamtest.c 685 2013-07-11 16:33:34Z des
+ * $OpenPAM: pamtest.c 938 2017-04-30 21:34:42Z des $
*/
#ifdef HAVE_CONFIG_H
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/bin/su/su.1
--- a/external/bsd/openpam/dist/bin/su/su.1 Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.1 Sat May 06 19:50:09 2017 +0000
@@ -1,7 +1,7 @@
-.\" $NetBSD: su.1,v 1.7 2014/10/24 18:27:12 christos Exp $
+.\" $NetBSD: su.1,v 1.8 2017/05/06 19:50:09 christos Exp $
.\"
.\"-
-.\" Copyright (c) 2011 Dag-Erling Smørgrav
+.\" Copyright (c) 2011-2017 Dag-Erling Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Id: su.1 816 2014-09-12 07:50:22Z des
+.\" $OpenPAM: su.1 939 2017-04-30 21:36:50Z des $
.\"
-.Dd September 12, 2014
+.Dd April 30, 2017
.Dt SU 1
.Os
.Sh NAME
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/bin/su/su.c
--- a/external/bsd/openpam/dist/bin/su/su.c Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.c Sat May 06 19:50:09 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: su.c,v 1.6 2014/10/24 18:27:12 christos Exp $ */
+/* $NetBSD: su.c,v 1.7 2017/05/06 19:50:09 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * Id: su.c 648 2013-03-05 17:54:27Z des
+ * $OpenPAM: su.c 938 2017-04-30 21:34:42Z des $
*/
#ifdef HAVE_CONFIG_H
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/doc/man/openpam.3
--- a/external/bsd/openpam/dist/doc/man/openpam.3 Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam.3 Sat May 06 19:50:09 2017 +0000
@@ -1,18 +1,89 @@
-.\" $NetBSD: openpam.3,v 1.9 2015/06/05 20:35:10 joerg Exp $
+.\" $NetBSD: openpam.3,v 1.10 2017/05/06 19:50:09 christos Exp $
.\"
.\" Generated by gendoc.pl
-.Dd September 12, 2014
+.Dd April 30, 2017
.Dt OPENPAM 3
.Os
.Sh NAME
-.Nm openpam
+.Nm openpam_borrow_cred ,
+.Nm openpam_free_data ,
+.Nm openpam_free_envlist ,
+.Nm openpam_get_feature ,
+.Nm openpam_get_option ,
+.Nm openpam_log ,
+.Nm openpam_nullconv ,
+.Nm openpam_readline ,
+.Nm openpam_readlinev ,
+.Nm openpam_readword ,
+.Nm openpam_restore_cred ,
+.Nm openpam_set_feature ,
+.Nm openpam_set_option ,
+.Nm openpam_straddch ,
+.Nm openpam_subst ,
+.Nm openpam_ttyconv ,
+.Nm pam_error ,
+.Nm pam_get_authtok ,
+.Nm pam_info ,
+.Nm pam_prompt ,
+.Nm pam_setenv ,
+.Nm pam_verror ,
+.Nm pam_vinfo ,
+.Nm pam_vprompt
.Nd Pluggable Authentication Modules Library
.Sh LIBRARY
.Lb libpam
.Sh SYNOPSIS
.In security/openpam.h
+.Ft "int"
+.Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd"
+.Ft "void"
+.Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status"
+.Ft "void"
+.Fn openpam_free_envlist "char **envlist"
+.Ft "int"
+.Fn openpam_get_feature "int feature" "int *onoff"
+.Ft "const char *"
+.Fn openpam_get_option "pam_handle_t *pamh" "const char *option"
+.Ft "void"
+.Fn openpam_log "int level" "const char *fmt" "..."
+.Ft "int"
+.Fn openpam_nullconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
+.Ft "char *"
+.Fn openpam_readline "FILE *f" "int *lineno" "size_t *lenp"
+.Ft "char **"
+.Fn openpam_readlinev "FILE *f" "int *lineno" "int *lenp"
+.Ft "char *"
+.Fn openpam_readword "FILE *f" "int *lineno" "size_t *lenp"
+.Ft "int"
+.Fn openpam_restore_cred "pam_handle_t *pamh"
+.Ft "int"
+.Fn openpam_set_feature "int feature" "int onoff"
+.Ft "int"
+.Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value"
+.Ft "int"
+.Fn openpam_straddch "char **str" "size_t *size" "size_t *len" "int ch"
+.Ft "int"
+.Fn openpam_subst "const pam_handle_t *pamh" "char *buf" "size_t *bufsize" "const char *template"
+.Ft "int"
+.Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
+.Ft "int"
+.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 "const pam_handle_t *pamh" "const char *fmt" "..."
+.Ft "int"
+.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 "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
+.Ft "int"
+.Fn pam_vinfo "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
+.Ft "int"
+.Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
.\"
-.\" Id: openpam.man 648 2013-03-05 17:54:27Z des
+.\" $OpenPAM: openpam.man 938 2017-04-30 21:34:42Z des $
.\"
.Sh DESCRIPTION
These functions are OpenPAM extensions to the PAM API.
@@ -25,6 +96,30 @@
to OpenPAM implementation details, and therefore not well suited to
standardization.
.Sh SEE ALSO
+.Xr openpam_borrow_cred 3 ,
+.Xr openpam_free_data 3 ,
+.Xr openpam_free_envlist 3 ,
+.Xr openpam_get_feature 3 ,
+.Xr openpam_get_option 3 ,
+.Xr openpam_log 3 ,
+.Xr openpam_nullconv 3 ,
+.Xr openpam_readline 3 ,
+.Xr openpam_readlinev 3 ,
+.Xr openpam_readword 3 ,
+.Xr openpam_restore_cred 3 ,
+.Xr openpam_set_feature 3 ,
+.Xr openpam_set_option 3 ,
+.Xr openpam_straddch 3 ,
+.Xr openpam_subst 3 ,
+.Xr openpam_ttyconv 3 ,
+.Xr pam_error 3 ,
+.Xr pam_get_authtok 3 ,
+.Xr pam_info 3 ,
+.Xr pam_prompt 3 ,
+.Xr pam_setenv 3 ,
+.Xr pam_verror 3 ,
+.Xr pam_vinfo 3 ,
+.Xr pam_vprompt 3
.Sh STANDARDS
.Rs
.%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3
--- a/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 Sat May 06 19:50:09 2017 +0000
@@ -1,15 +1,13 @@
-.\" $NetBSD: openpam_borrow_cred.3,v 1.6 2014/10/24 18:25:14 christos Exp $
+.\" $NetBSD: openpam_borrow_cred.3,v 1.7 2017/05/06 19:50:09 christos Exp $
.\"
.\" Generated from openpam_borrow_cred.c by gendoc.pl
-.\" Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des
-.Dd September 12, 2014
+.\" $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $
+.Dd April 30, 2017
.Dt OPENPAM_BORROW_CRED 3
.Os
.Sh NAME
.Nm openpam_borrow_cred
.Nd temporarily borrow user credentials
-.Sh LIBRARY
-.Lb libpam
.Sh SYNOPSIS
.In sys/types.h
.In security/pam_appl.h
@@ -32,6 +30,8 @@
.Fn openpam_borrow_cred
function returns one of the following values:
.Bl -tag -width 18n
+.It Bq Er PAM_SUCCESS
+Success.
.It Bq Er PAM_BUF_ERR
Memory buffer error.
.It Bq Er PAM_PERM_DENIED
@@ -63,4 +63,4 @@
as part of the DARPA CHATS research program.
.Pp
The OpenPAM library is maintained by
-.An Dag-Erling Sm\(/orgrav Aq des%des.no@localhost .
+.An Dag-Erling Sm\(/orgrav Aq Mt des%des.no@localhost .
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/doc/man/openpam_free_data.3
--- a/external/bsd/openpam/dist/doc/man/openpam_free_data.3 Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_free_data.3 Sat May 06 19:50:09 2017 +0000
@@ -1,15 +1,13 @@
-.\" $NetBSD: openpam_free_data.3,v 1.6 2014/10/24 18:25:14 christos Exp $
+.\" $NetBSD: openpam_free_data.3,v 1.7 2017/05/06 19:50:09 christos Exp $
.\"
.\" Generated from openpam_free_data.c by gendoc.pl
-.\" Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des
-.Dd September 12, 2014
+.\" $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $
+.Dd April 30, 2017
.Dt OPENPAM_FREE_DATA 3
.Os
.Sh NAME
.Nm openpam_free_data
.Nd generic cleanup function
-.Sh LIBRARY
-.Lb libpam
.Sh SYNOPSIS
.In sys/types.h
.In security/pam_appl.h
@@ -47,4 +45,4 @@
as part of the DARPA CHATS research program.
.Pp
The OpenPAM library is maintained by
-.An Dag-Erling Sm\(/orgrav Aq des%des.no@localhost .
+.An Dag-Erling Sm\(/orgrav Aq Mt des%des.no@localhost .
diff -r df98b4681bd0 -r b405f89792d7 external/bsd/openpam/dist/doc/man/openpam_free_envlist.3
--- a/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 Sat May 06 19:32:37 2017 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 Sat May 06 19:50:09 2017 +0000
@@ -1,15 +1,13 @@
-.\" $NetBSD: openpam_free_envlist.3,v 1.7 2014/10/24 18:25:14 christos Exp $
+.\" $NetBSD: openpam_free_envlist.3,v 1.8 2017/05/06 19:50:09 christos Exp $
.\"
.\" Generated from openpam_free_envlist.c by gendoc.pl
-.\" Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des
-.Dd September 12, 2014
+.\" $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $
+.Dd April 30, 2017
.Dt OPENPAM_FREE_ENVLIST 3
.Os
.Sh NAME
.Nm openpam_free_envlist
.Nd free an environment list
-.Sh LIBRARY
-.Lb libpam
.Sh SYNOPSIS
.In sys/types.h
Home |
Main Index |
Thread Index |
Old Index