Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/openpam merge conflicts
details: https://anonhg.NetBSD.org/src/rev/167bb967b1b5
branches: trunk
changeset: 333235:167bb967b1b5
user: christos <christos%NetBSD.org@localhost>
date: Fri Oct 24 18:17:55 2014 +0000
description:
merge conflicts
diffstat:
external/bsd/openpam/dist/bin/pamtest/pamtest.1 | 11 +-
external/bsd/openpam/dist/bin/pamtest/pamtest.c | 5 +-
external/bsd/openpam/dist/bin/su/su.1 | 11 +-
external/bsd/openpam/dist/bin/su/su.c | 5 +-
external/bsd/openpam/dist/doc/man/openpam.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_free_data.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_get_feature.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_get_option.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_log.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_nullconv.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_readline.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_readlinev.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_readword.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_set_feature.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_set_option.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_straddch.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_subst.3 | 7 +-
external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 | 9 +-
external/bsd/openpam/dist/doc/man/pam.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam.conf.5 | 9 +-
external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_authenticate.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_chauthtok.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_close_session.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_conv.3 | 11 +-
external/bsd/openpam/dist/doc/man/pam_end.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_error.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_get_authtok.3 | 9 +-
external/bsd/openpam/dist/doc/man/pam_get_data.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_get_item.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_get_user.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_getenv.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_getenvlist.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_info.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_open_session.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_prompt.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_putenv.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_set_data.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_set_item.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_setcred.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_setenv.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_start.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_strerror.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_verror.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_vinfo.3 | 7 +-
external/bsd/openpam/dist/doc/man/pam_vprompt.3 | 7 +-
external/bsd/openpam/dist/include/security/openpam.h | 2 +-
external/bsd/openpam/dist/include/security/openpam_attr.h | 2 +-
external/bsd/openpam/dist/include/security/openpam_version.h | 8 +-
external/bsd/openpam/dist/include/security/pam_appl.h | 2 +-
external/bsd/openpam/dist/include/security/pam_constants.h | 2 +-
external/bsd/openpam/dist/include/security/pam_modules.h | 2 +-
external/bsd/openpam/dist/include/security/pam_types.h | 2 +-
external/bsd/openpam/dist/lib/libpam/openpam_asprintf.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_asprintf.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_borrow_cred.c | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_check_owner_perms.c | 10 +-
external/bsd/openpam/dist/lib/libpam/openpam_configure.c | 32 +-
external/bsd/openpam/dist/lib/libpam/openpam_constants.c | 9 +
external/bsd/openpam/dist/lib/libpam/openpam_constants.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_cred.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_ctype.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_debug.h | 18 +-
external/bsd/openpam/dist/lib/libpam/openpam_dispatch.c | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_dlfunc.h | 17 +-
external/bsd/openpam/dist/lib/libpam/openpam_dynamic.c | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_features.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_features.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_findenv.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_free_data.c | 7 +
external/bsd/openpam/dist/lib/libpam/openpam_free_envlist.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_get_feature.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_get_option.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_impl.h | 6 +-
external/bsd/openpam/dist/lib/libpam/openpam_load.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_log.c | 8 +
external/bsd/openpam/dist/lib/libpam/openpam_nullconv.c | 9 +
external/bsd/openpam/dist/lib/libpam/openpam_readline.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_readlinev.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_readword.c | 37 +-
external/bsd/openpam/dist/lib/libpam/openpam_restore_cred.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_set_feature.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_set_option.c | 8 +-
external/bsd/openpam/dist/lib/libpam/openpam_static.c | 9 +-
external/bsd/openpam/dist/lib/libpam/openpam_straddch.c | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlcat.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_strlcat.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_strlcmp.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_strlcpy.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_strlcpy.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_strlset.c | 7 +-
external/bsd/openpam/dist/lib/libpam/openpam_strlset.h | 2 +
external/bsd/openpam/dist/lib/libpam/openpam_subst.c | 13 +-
external/bsd/openpam/dist/lib/libpam/openpam_ttyconv.c | 62 +-
external/bsd/openpam/dist/lib/libpam/openpam_vasprintf.c | 5 +
external/bsd/openpam/dist/lib/libpam/openpam_vasprintf.h | 2 +
external/bsd/openpam/dist/lib/libpam/pam_acct_mgmt.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_authenticate.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_authenticate_secondary.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_chauthtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_close_session.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_end.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_error.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_get_authtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_get_data.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_get_item.c | 11 +
external/bsd/openpam/dist/lib/libpam/pam_get_mapped_authtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_get_mapped_username.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_get_user.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_getenv.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_getenvlist.c | 7 +-
external/bsd/openpam/dist/lib/libpam/pam_info.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_open_session.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_prompt.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_putenv.c | 10 +-
external/bsd/openpam/dist/lib/libpam/pam_set_data.c | 7 +
external/bsd/openpam/dist/lib/libpam/pam_set_item.c | 12 +-
external/bsd/openpam/dist/lib/libpam/pam_set_mapped_authtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_set_mapped_username.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_setcred.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_setenv.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_acct_mgmt.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_authenticate.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_authenticate_secondary.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_chauthtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_close_session.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_get_mapped_authtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_get_mapped_username.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_open_session.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_set_mapped_authtok.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_set_mapped_username.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_sm_setcred.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_start.c | 31 +-
external/bsd/openpam/dist/lib/libpam/pam_strerror.c | 6 +
external/bsd/openpam/dist/lib/libpam/pam_verror.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_vinfo.c | 5 +
external/bsd/openpam/dist/lib/libpam/pam_vprompt.c | 7 +-
external/bsd/openpam/dist/lib/openpam_asprintf.c | 59 -
external/bsd/openpam/dist/lib/openpam_asprintf.h | 43 -
external/bsd/openpam/dist/lib/openpam_borrow_cred.c | 129 -
external/bsd/openpam/dist/lib/openpam_check_owner_perms.c | 148 -
external/bsd/openpam/dist/lib/openpam_configure.c | 516 -
external/bsd/openpam/dist/lib/openpam_constants.c | 151 -
external/bsd/openpam/dist/lib/openpam_constants.h | 47 -
external/bsd/openpam/dist/lib/openpam_cred.h | 54 -
external/bsd/openpam/dist/lib/openpam_ctype.h | 91 -
external/bsd/openpam/dist/lib/openpam_debug.h | 114 -
external/bsd/openpam/dist/lib/openpam_dispatch.c | 264 -
external/bsd/openpam/dist/lib/openpam_dlfunc.h | 58 -
external/bsd/openpam/dist/lib/openpam_dynamic.c | 264 -
external/bsd/openpam/dist/lib/openpam_features.c | 70 -
external/bsd/openpam/dist/lib/openpam_features.h | 49 -
external/bsd/openpam/dist/lib/openpam_findenv.c | 76 -
external/bsd/openpam/dist/lib/openpam_free_data.c | 80 -
external/bsd/openpam/dist/lib/openpam_free_envlist.c | 73 -
external/bsd/openpam/dist/lib/openpam_get_feature.c | 100 -
external/bsd/openpam/dist/lib/openpam_get_option.c | 89 -
external/bsd/openpam/dist/lib/openpam_impl.h | 168 -
external/bsd/openpam/dist/lib/openpam_load.c | 137 -
external/bsd/openpam/dist/lib/openpam_log.c | 178 -
external/bsd/openpam/dist/lib/openpam_nullconv.c | 97 -
external/bsd/openpam/dist/lib/openpam_readline.c | 138 -
external/bsd/openpam/dist/lib/openpam_readlinev.c | 157 -
external/bsd/openpam/dist/lib/openpam_readword.c | 203 -
external/bsd/openpam/dist/lib/openpam_restore_cred.c | 102 -
external/bsd/openpam/dist/lib/openpam_set_feature.c | 76 -
external/bsd/openpam/dist/lib/openpam_set_option.c | 127 -
external/bsd/openpam/dist/lib/openpam_static.c | 76 -
external/bsd/openpam/dist/lib/openpam_straddch.c | 119 -
external/bsd/openpam/dist/lib/openpam_strlcat.c | 60 -
external/bsd/openpam/dist/lib/openpam_strlcat.h | 43 -
external/bsd/openpam/dist/lib/openpam_strlcmp.h | 50 -
external/bsd/openpam/dist/lib/openpam_strlcpy.c | 58 -
external/bsd/openpam/dist/lib/openpam_strlcpy.h | 43 -
external/bsd/openpam/dist/lib/openpam_subst.c | 172 -
external/bsd/openpam/dist/lib/openpam_ttyconv.c | 447 -
external/bsd/openpam/dist/lib/openpam_vasprintf.c | 62 -
external/bsd/openpam/dist/lib/openpam_vasprintf.h | 43 -
external/bsd/openpam/dist/lib/pam_acct_mgmt.c | 91 -
external/bsd/openpam/dist/lib/pam_authenticate.c | 99 -
external/bsd/openpam/dist/lib/pam_authenticate_secondary.c | 69 -
external/bsd/openpam/dist/lib/pam_chauthtok.c | 100 -
external/bsd/openpam/dist/lib/pam_close_session.c | 92 -
external/bsd/openpam/dist/lib/pam_end.c | 109 -
external/bsd/openpam/dist/lib/pam_error.c | 91 -
external/bsd/openpam/dist/lib/pam_get_authtok.c | 242 -
external/bsd/openpam/dist/lib/pam_get_data.c | 94 -
external/bsd/openpam/dist/lib/pam_get_item.c | 145 -
external/bsd/openpam/dist/lib/pam_get_mapped_authtok.c | 68 -
external/bsd/openpam/dist/lib/pam_get_mapped_username.c | 69 -
external/bsd/openpam/dist/lib/pam_get_user.c | 149 -
external/bsd/openpam/dist/lib/pam_getenv.c | 90 -
external/bsd/openpam/dist/lib/pam_getenvlist.c | 113 -
external/bsd/openpam/dist/lib/pam_info.c | 91 -
external/bsd/openpam/dist/lib/pam_open_session.c | 93 -
external/bsd/openpam/dist/lib/pam_prompt.c | 96 -
external/bsd/openpam/dist/lib/pam_putenv.c | 116 -
external/bsd/openpam/dist/lib/pam_set_data.c | 113 -
external/bsd/openpam/dist/lib/pam_set_item.c | 137 -
external/bsd/openpam/dist/lib/pam_set_mapped_authtok.c | 68 -
external/bsd/openpam/dist/lib/pam_set_mapped_username.c | 69 -
external/bsd/openpam/dist/lib/pam_setcred.c | 102 -
external/bsd/openpam/dist/lib/pam_setenv.c | 106 -
external/bsd/openpam/dist/lib/pam_sm_acct_mgmt.c | 87 -
external/bsd/openpam/dist/lib/pam_sm_authenticate.c | 88 -
external/bsd/openpam/dist/lib/pam_sm_authenticate_secondary.c | 74 -
external/bsd/openpam/dist/lib/pam_sm_chauthtok.c | 93 -
external/bsd/openpam/dist/lib/pam_sm_close_session.c | 84 -
external/bsd/openpam/dist/lib/pam_sm_get_mapped_authtok.c | 73 -
external/bsd/openpam/dist/lib/pam_sm_get_mapped_username.c | 74 -
external/bsd/openpam/dist/lib/pam_sm_open_session.c | 84 -
external/bsd/openpam/dist/lib/pam_sm_set_mapped_authtok.c | 73 -
external/bsd/openpam/dist/lib/pam_sm_set_mapped_username.c | 71 -
external/bsd/openpam/dist/lib/pam_sm_setcred.c | 88 -
external/bsd/openpam/dist/lib/pam_start.c | 133 -
external/bsd/openpam/dist/lib/pam_strerror.c | 140 -
external/bsd/openpam/dist/lib/pam_verror.c | 86 -
external/bsd/openpam/dist/lib/pam_vinfo.c | 86 -
external/bsd/openpam/dist/lib/pam_vprompt.c | 136 -
external/bsd/openpam/dist/m4/libtool.m4 | 7982 ----------
external/bsd/openpam/dist/m4/ltoptions.m4 | 384 -
external/bsd/openpam/dist/m4/ltsugar.m4 | 123 -
external/bsd/openpam/dist/m4/ltversion.m4 | 23 -
external/bsd/openpam/dist/m4/lt~obsolete.m4 | 98 -
external/bsd/openpam/dist/modules/pam_deny/pam_deny.c | 5 +-
external/bsd/openpam/dist/modules/pam_permit/pam_permit.c | 5 +-
external/bsd/openpam/dist/modules/pam_unix/pam_unix.c | 5 +-
external/bsd/openpam/dist/t/t_openpam_readlinev.c | 34 +
external/bsd/openpam/dist/t/t_openpam_readword.c | 86 +
external/bsd/openpam/openpam2netbsd | 29 +-
239 files changed, 994 insertions(+), 17938 deletions(-)
diffs (truncated from 21544 to 300 lines):
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/bin/pamtest/pamtest.1
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Fri Oct 24 18:17:55 2014 +0000
@@ -1,5 +1,8 @@
-.\" $NetBSD: pamtest.1,v 1.5 2013/12/27 20:10:20 christos Exp $
+<<<<<<< pamtest.1
+.\" $NetBSD: pamtest.1,v 1.6 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\"-
.\" Copyright (c) 2011 Dag-Erling Smørgrav
.\" All rights reserved.
@@ -28,15 +31,15 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Id: pamtest.1 741 2013-09-07 13:34:02Z des
+.\" Id: pamtest.1 816 2014-09-12 07:50:22Z des
.\"
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt PAMTEST 1
.Os
.Sh NAME
.Nm pamtest
.Nd PAM policy tester
-.Sh SYNOPSYS
+.Sh SYNOPSIS
.Nm
.Op Fl dkMPsv
.Op Fl H Ar rhost
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/bin/pamtest/pamtest.c
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.c Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.c Fri Oct 24 18:17:55 2014 +0000
@@ -1,5 +1,8 @@
-/* $NetBSD: pamtest.c,v 1.4 2013/12/27 20:10:20 christos Exp $ */
+<<<<<<< pamtest.c
+/* $NetBSD: pamtest.c,v 1.5 2014/10/24 18:17:56 christos Exp $ */
+=======
+>>>>>>> 1.1.1.4
/*-
* Copyright (c) 2011 Dag-Erling Smørgrav
* All rights reserved.
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/bin/su/su.1
--- a/external/bsd/openpam/dist/bin/su/su.1 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.1 Fri Oct 24 18:17:55 2014 +0000
@@ -1,5 +1,8 @@
-.\" $NetBSD: su.1,v 1.5 2013/12/27 20:10:20 christos Exp $
+<<<<<<< su.1
+.\" $NetBSD: su.1,v 1.6 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\"-
.\" Copyright (c) 2011 Dag-Erling Smørgrav
.\" All rights reserved.
@@ -28,15 +31,15 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Id: su.1 741 2013-09-07 13:34:02Z des
+.\" Id: su.1 816 2014-09-12 07:50:22Z des
.\"
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt SU 1
.Os
.Sh NAME
.Nm su
.Nd switch user identity
-.Sh SYNOPSYS
+.Sh SYNOPSIS
.Nm
.Op Ar login Op Ar ...
.Sh DESCRIPTION
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/bin/su/su.c
--- a/external/bsd/openpam/dist/bin/su/su.c Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.c Fri Oct 24 18:17:55 2014 +0000
@@ -1,5 +1,8 @@
-/* $NetBSD: su.c,v 1.4 2013/12/27 20:10:20 christos Exp $ */
+<<<<<<< su.c
+/* $NetBSD: su.c,v 1.5 2014/10/24 18:17:56 christos Exp $ */
+=======
+>>>>>>> 1.1.1.4
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
* Copyright (c) 2004-2011 Dag-Erling Smørgrav
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam.3
--- a/external/bsd/openpam/dist/doc/man/openpam.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,7 +1,10 @@
-.\" $NetBSD: openpam.3,v 1.6 2014/06/10 11:36:41 wiz Exp $
+<<<<<<< openpam.3
+.\" $NetBSD: openpam.3,v 1.7 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated by gendoc.pl
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3
--- a/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_borrow_cred.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_borrow_cred.3
+.\" $NetBSD: openpam_borrow_cred.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_borrow_cred.c by gendoc.pl
.\" Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_BORROW_CRED 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_free_data.3
--- a/external/bsd/openpam/dist/doc/man/openpam_free_data.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_free_data.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_free_data.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_free_data.3
+.\" $NetBSD: openpam_free_data.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_free_data.c by gendoc.pl
.\" Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_FREE_DATA 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_free_envlist.3
--- a/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_free_envlist.3,v 1.5 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_free_envlist.3
+.\" $NetBSD: openpam_free_envlist.3,v 1.6 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_free_envlist.c by gendoc.pl
.\" Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_FREE_ENVLIST 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_get_feature.3
--- a/external/bsd/openpam/dist/doc/man/openpam_get_feature.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_get_feature.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_get_feature.3,v 1.3 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_get_feature.3
+.\" $NetBSD: openpam_get_feature.3,v 1.4 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.3
.\" Generated from openpam_get_feature.c by gendoc.pl
.\" Id: openpam_get_feature.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_GET_FEATURE 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_get_option.3
--- a/external/bsd/openpam/dist/doc/man/openpam_get_option.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_get_option.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_get_option.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_get_option.3
+.\" $NetBSD: openpam_get_option.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_get_option.c by gendoc.pl
.\" Id: openpam_get_option.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_GET_OPTION 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_log.3
--- a/external/bsd/openpam/dist/doc/man/openpam_log.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_log.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_log.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_log.3
+.\" $NetBSD: openpam_log.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_log.c by gendoc.pl
.\" Id: openpam_log.c 686 2013-07-11 16:36:02Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_LOG 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_nullconv.3
--- a/external/bsd/openpam/dist/doc/man/openpam_nullconv.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_nullconv.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_nullconv.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_nullconv.3
+.\" $NetBSD: openpam_nullconv.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_nullconv.c by gendoc.pl
.\" Id: openpam_nullconv.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_NULLCONV 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_readline.3
--- a/external/bsd/openpam/dist/doc/man/openpam_readline.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_readline.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_readline.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_readline.3
+.\" $NetBSD: openpam_readline.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_readline.c by gendoc.pl
.\" Id: openpam_readline.c 703 2013-08-16 11:57:54Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_READLINE 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_readlinev.3
--- a/external/bsd/openpam/dist/doc/man/openpam_readlinev.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_readlinev.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_readlinev.3,v 1.3 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_readlinev.3
+.\" $NetBSD: openpam_readlinev.3,v 1.4 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.3
.\" Generated from openpam_readlinev.c by gendoc.pl
.\" Id: openpam_readlinev.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_READLINEV 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_readword.3
--- a/external/bsd/openpam/dist/doc/man/openpam_readword.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_readword.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_readword.3,v 1.3 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_readword.3
+.\" $NetBSD: openpam_readword.3,v 1.4 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.3
.\" Generated from openpam_readword.c by gendoc.pl
.\" Id: openpam_readword.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_READWORD 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_restore_cred.3
--- a/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_restore_cred.3,v 1.4 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_restore_cred.3
+.\" $NetBSD: openpam_restore_cred.3,v 1.5 2014/10/24 18:17:56 christos Exp $
.\"
+=======
+>>>>>>> 1.1.1.4
.\" Generated from openpam_restore_cred.c by gendoc.pl
.\" Id: openpam_restore_cred.c 648 2013-03-05 17:54:27Z des
-.Dd September 7, 2013
+.Dd September 12, 2014
.Dt OPENPAM_RESTORE_CRED 3
.Os
.Sh NAME
diff -r 01d3bc6205a9 -r 167bb967b1b5 external/bsd/openpam/dist/doc/man/openpam_set_feature.3
--- a/external/bsd/openpam/dist/doc/man/openpam_set_feature.3 Fri Oct 24 18:15:36 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_set_feature.3 Fri Oct 24 18:17:55 2014 +0000
@@ -1,8 +1,11 @@
-.\" $NetBSD: openpam_set_feature.3,v 1.3 2013/12/27 20:10:20 christos Exp $
+<<<<<<< openpam_set_feature.3
+.\" $NetBSD: openpam_set_feature.3,v 1.4 2014/10/24 18:17:56 christos Exp $
Home |
Main Index |
Thread Index |
Old Index