Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/openpam resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/ed00eb137af0
branches: trunk
changeset: 588013:ed00eb137af0
user: christos <christos%NetBSD.org@localhost>
date: Sun Feb 05 02:37:45 2006 +0000
description:
resolve conflicts
diffstat:
dist/openpam/doc/man/openpam.3 | 4 ++--
dist/openpam/doc/man/openpam_borrow_cred.3 | 4 ++--
dist/openpam/doc/man/openpam_free_data.3 | 4 ++--
dist/openpam/doc/man/openpam_get_option.3 | 4 ++--
dist/openpam/doc/man/openpam_log.3 | 4 ++--
dist/openpam/doc/man/openpam_nullconv.3 | 4 ++--
dist/openpam/doc/man/openpam_readline.3 | 4 ++--
dist/openpam/doc/man/openpam_restore_cred.3 | 4 ++--
dist/openpam/doc/man/openpam_set_option.3 | 4 ++--
dist/openpam/doc/man/openpam_ttyconv.3 | 4 ++--
dist/openpam/doc/man/pam.3 | 10 +++++-----
dist/openpam/doc/man/pam_acct_mgmt.3 | 4 ++--
dist/openpam/doc/man/pam_authenticate.3 | 4 ++--
dist/openpam/doc/man/pam_chauthtok.3 | 4 ++--
dist/openpam/doc/man/pam_close_session.3 | 4 ++--
dist/openpam/doc/man/pam_end.3 | 4 ++--
dist/openpam/doc/man/pam_error.3 | 4 ++--
dist/openpam/doc/man/pam_get_authtok.3 | 4 ++--
dist/openpam/doc/man/pam_get_data.3 | 4 ++--
dist/openpam/doc/man/pam_get_item.3 | 4 ++--
dist/openpam/doc/man/pam_get_user.3 | 4 ++--
dist/openpam/doc/man/pam_getenv.3 | 4 ++--
dist/openpam/doc/man/pam_getenvlist.3 | 4 ++--
dist/openpam/doc/man/pam_info.3 | 4 ++--
dist/openpam/doc/man/pam_open_session.3 | 4 ++--
dist/openpam/doc/man/pam_prompt.3 | 4 ++--
dist/openpam/doc/man/pam_putenv.3 | 4 ++--
dist/openpam/doc/man/pam_set_data.3 | 4 ++--
dist/openpam/doc/man/pam_set_item.3 | 4 ++--
dist/openpam/doc/man/pam_setcred.3 | 4 ++--
dist/openpam/doc/man/pam_setenv.3 | 4 ++--
dist/openpam/doc/man/pam_sm_acct_mgmt.3 | 4 ++--
dist/openpam/doc/man/pam_sm_authenticate.3 | 4 ++--
dist/openpam/doc/man/pam_sm_chauthtok.3 | 4 ++--
dist/openpam/doc/man/pam_sm_close_session.3 | 4 ++--
dist/openpam/doc/man/pam_sm_open_session.3 | 4 ++--
dist/openpam/doc/man/pam_sm_setcred.3 | 4 ++--
dist/openpam/doc/man/pam_start.3 | 4 ++--
dist/openpam/doc/man/pam_strerror.3 | 4 ++--
dist/openpam/doc/man/pam_verror.3 | 4 ++--
dist/openpam/doc/man/pam_vinfo.3 | 4 ++--
dist/openpam/doc/man/pam_vprompt.3 | 4 ++--
dist/openpam/include/security/openpam.h | 1 -
dist/openpam/lib/openpam_dynamic.c | 6 +++---
dist/openpam/lib/openpam_load.c | 2 +-
dist/openpam/lib/openpam_readline.c | 8 ++++----
dist/openpam/lib/openpam_ttyconv.c | 2 +-
dist/openpam/misc/gendoc.pl | 12 ++++++++++--
48 files changed, 106 insertions(+), 99 deletions(-)
diffs (truncated from 915 to 300 lines):
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam.3
--- a/dist/openpam/doc/man/openpam.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_borrow_cred.3
--- a/dist/openpam/doc/man/openpam_borrow_cred.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_borrow_cred.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_borrow_cred.3,v 1.6 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_borrow_cred.3,v 1.7 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_BORROW_CRED 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_free_data.3
--- a/dist/openpam/doc/man/openpam_free_data.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_free_data.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_free_data.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_free_data.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_FREE_DATA 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_get_option.3
--- a/dist/openpam/doc/man/openpam_get_option.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_get_option.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_get_option.3,v 1.4 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_get_option.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_GET_OPTION 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_log.3
--- a/dist/openpam/doc/man/openpam_log.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_log.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_log.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_log.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_LOG 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_nullconv.3
--- a/dist/openpam/doc/man/openpam_nullconv.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_nullconv.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_nullconv.3,v 1.5 2005/02/28 10:48:08 wiz Exp $
+.\" $NetBSD: openpam_nullconv.3,v 1.6 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_NULLCONV 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_readline.3
--- a/dist/openpam/doc/man/openpam_readline.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_readline.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_readline.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_readline.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_READLINE 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_restore_cred.3
--- a/dist/openpam/doc/man/openpam_restore_cred.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_restore_cred.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_restore_cred.3,v 1.6 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_restore_cred.3,v 1.7 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_RESTORE_CRED 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_set_option.3
--- a/dist/openpam/doc/man/openpam_set_option.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_set_option.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_set_option.3,v 1.4 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_set_option.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_SET_OPTION 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/openpam_ttyconv.3
--- a/dist/openpam/doc/man/openpam_ttyconv.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/openpam_ttyconv.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: openpam_ttyconv.3,v 1.4 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: openpam_ttyconv.3,v 1.5 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt OPENPAM_TTYCONV 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/pam.3
--- a/dist/openpam/doc/man/pam.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/pam.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: pam.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt PAM 3
.Os
.Sh NAME
@@ -268,15 +268,15 @@
.Xr pam_conv 3 ,
.Xr pam_end 3 ,
.Xr pam_get_data 3 ,
-.Xr pam_get_item 3 ,
-.Xr pam_get_user 3 ,
.Xr pam_getenv 3 ,
.Xr pam_getenvlist 3 ,
+.Xr pam_get_item 3 ,
+.Xr pam_get_user 3 ,
.Xr pam_open_session 3 ,
.Xr pam_putenv 3 ,
+.Xr pam_setcred 3 ,
.Xr pam_set_data 3 ,
.Xr pam_set_item 3 ,
-.Xr pam_setcred 3 ,
.Xr pam_start 3 ,
.Xr pam_strerror 3
.Sh STANDARDS
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/pam_acct_mgmt.3
--- a/dist/openpam/doc/man/pam_acct_mgmt.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/pam_acct_mgmt.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_acct_mgmt.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: pam_acct_mgmt.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt PAM_ACCT_MGMT 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/pam_authenticate.3
--- a/dist/openpam/doc/man/pam_authenticate.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/pam_authenticate.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_authenticate.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: pam_authenticate.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt PAM_AUTHENTICATE 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/pam_chauthtok.3
--- a/dist/openpam/doc/man/pam_chauthtok.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/pam_chauthtok.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_chauthtok.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: pam_chauthtok.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt PAM_CHAUTHTOK 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/pam_close_session.3
--- a/dist/openpam/doc/man/pam_close_session.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/pam_close_session.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_close_session.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: pam_close_session.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
.\" $P4$
.\"
-.Dd February 1, 2005
+.Dd June 16, 2005
.Dt PAM_CLOSE_SESSION 3
.Os
.Sh NAME
diff -r ab37c7f6edfc -r ed00eb137af0 dist/openpam/doc/man/pam_end.3
--- a/dist/openpam/doc/man/pam_end.3 Sun Feb 05 02:32:33 2006 +0000
+++ b/dist/openpam/doc/man/pam_end.3 Sun Feb 05 02:37:45 2006 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_end.3,v 1.3 2005/02/26 20:58:24 christos Exp $
+.\" $NetBSD: pam_end.3,v 1.4 2006/02/05 02:37:45 christos Exp $
.\"
.\"-
.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -35,7 +35,7 @@
.\"
Home |
Main Index |
Thread Index |
Old Index