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/f78881b08acc
branches: trunk
changeset: 325512:f78881b08acc
user: christos <christos%NetBSD.org@localhost>
date: Fri Dec 27 20:10:20 2013 +0000
description:
merge conflicts
diffstat:
external/bsd/openpam/dist/bin/pamtest/pamtest.1 | 10 +-
external/bsd/openpam/dist/bin/pamtest/pamtest.c | 46 +-
external/bsd/openpam/dist/bin/su/su.1 | 6 +-
external/bsd/openpam/dist/bin/su/su.c | 4 +-
external/bsd/openpam/dist/doc/man/openpam.3 | 139 +---
external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_free_data.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 | 42 +-
external/bsd/openpam/dist/doc/man/openpam_get_feature.3 | 44 +-
external/bsd/openpam/dist/doc/man/openpam_get_option.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_log.3 | 50 +-
external/bsd/openpam/dist/doc/man/openpam_nullconv.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_readline.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_readlinev.3 | 42 +-
external/bsd/openpam/dist/doc/man/openpam_readword.3 | 42 +-
external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_set_feature.3 | 44 +-
external/bsd/openpam/dist/doc/man/openpam_set_option.3 | 45 +-
external/bsd/openpam/dist/doc/man/openpam_straddch.3 | 61 +-
external/bsd/openpam/dist/doc/man/openpam_subst.3 | 42 +-
external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam.3 | 113 +--
external/bsd/openpam/dist/doc/man/pam.conf.5 | 68 +-
external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_authenticate.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_chauthtok.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_close_session.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_conv.3 | 6 +-
external/bsd/openpam/dist/doc/man/pam_end.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_error.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_get_authtok.3 | 127 +-
external/bsd/openpam/dist/doc/man/pam_get_data.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_get_item.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_get_user.3 | 79 +-
external/bsd/openpam/dist/doc/man/pam_getenv.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_getenvlist.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_info.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_open_session.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_prompt.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_putenv.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_set_data.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_set_item.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_setcred.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_setenv.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_start.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_strerror.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_verror.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_vinfo.3 | 45 +-
external/bsd/openpam/dist/doc/man/pam_vprompt.3 | 45 +-
external/bsd/openpam/dist/include/security/openpam.h | 4 +-
external/bsd/openpam/dist/include/security/openpam_attr.h | 16 +-
external/bsd/openpam/dist/include/security/openpam_version.h | 8 +-
external/bsd/openpam/dist/include/security/pam_appl.h | 4 +-
external/bsd/openpam/dist/include/security/pam_constants.h | 4 +-
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/openpam_borrow_cred.c | 9 +-
external/bsd/openpam/dist/lib/openpam_check_owner_perms.c | 7 +-
external/bsd/openpam/dist/lib/openpam_configure.c | 17 +-
external/bsd/openpam/dist/lib/openpam_constants.c | 24 +-
external/bsd/openpam/dist/lib/openpam_constants.h | 10 +-
external/bsd/openpam/dist/lib/openpam_debug.h | 4 +-
external/bsd/openpam/dist/lib/openpam_dispatch.c | 13 +-
external/bsd/openpam/dist/lib/openpam_dlfunc.h | 17 +-
external/bsd/openpam/dist/lib/openpam_dynamic.c | 207 +++-
external/bsd/openpam/dist/lib/openpam_findenv.c | 4 +-
external/bsd/openpam/dist/lib/openpam_free_data.c | 4 +-
external/bsd/openpam/dist/lib/openpam_free_envlist.c | 7 +-
external/bsd/openpam/dist/lib/openpam_get_option.c | 4 +-
external/bsd/openpam/dist/lib/openpam_impl.h | 17 +-
external/bsd/openpam/dist/lib/openpam_load.c | 18 +-
external/bsd/openpam/dist/lib/openpam_log.c | 38 +-
external/bsd/openpam/dist/lib/openpam_nullconv.c | 4 +-
external/bsd/openpam/dist/lib/openpam_readline.c | 13 +-
external/bsd/openpam/dist/lib/openpam_restore_cred.c | 5 +-
external/bsd/openpam/dist/lib/openpam_set_option.c | 5 +-
external/bsd/openpam/dist/lib/openpam_static.c | 4 +-
external/bsd/openpam/dist/lib/openpam_strlcmp.h | 7 +-
external/bsd/openpam/dist/lib/openpam_strlcpy.h | 23 +-
external/bsd/openpam/dist/lib/openpam_subst.c | 7 +-
external/bsd/openpam/dist/lib/openpam_ttyconv.c | 364 ++++++---
external/bsd/openpam/dist/lib/pam_acct_mgmt.c | 4 +-
external/bsd/openpam/dist/lib/pam_authenticate.c | 4 +-
external/bsd/openpam/dist/lib/pam_authenticate_secondary.c | 4 +-
external/bsd/openpam/dist/lib/pam_chauthtok.c | 4 +-
external/bsd/openpam/dist/lib/pam_close_session.c | 4 +-
external/bsd/openpam/dist/lib/pam_end.c | 4 +-
external/bsd/openpam/dist/lib/pam_error.c | 4 +-
external/bsd/openpam/dist/lib/pam_get_authtok.c | 57 +-
external/bsd/openpam/dist/lib/pam_get_data.c | 4 +-
external/bsd/openpam/dist/lib/pam_get_item.c | 4 +-
external/bsd/openpam/dist/lib/pam_get_mapped_authtok.c | 4 +-
external/bsd/openpam/dist/lib/pam_get_mapped_username.c | 4 +-
external/bsd/openpam/dist/lib/pam_get_user.c | 27 +-
external/bsd/openpam/dist/lib/pam_getenv.c | 4 +-
external/bsd/openpam/dist/lib/pam_getenvlist.c | 4 +-
external/bsd/openpam/dist/lib/pam_info.c | 4 +-
external/bsd/openpam/dist/lib/pam_open_session.c | 4 +-
external/bsd/openpam/dist/lib/pam_prompt.c | 4 +-
external/bsd/openpam/dist/lib/pam_putenv.c | 4 +-
external/bsd/openpam/dist/lib/pam_set_data.c | 4 +-
external/bsd/openpam/dist/lib/pam_set_item.c | 4 +-
external/bsd/openpam/dist/lib/pam_set_mapped_authtok.c | 4 +-
external/bsd/openpam/dist/lib/pam_set_mapped_username.c | 4 +-
external/bsd/openpam/dist/lib/pam_setcred.c | 4 +-
external/bsd/openpam/dist/lib/pam_setenv.c | 5 +-
external/bsd/openpam/dist/lib/pam_sm_acct_mgmt.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_authenticate.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_authenticate_secondary.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_chauthtok.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_close_session.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_get_mapped_authtok.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_get_mapped_username.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_open_session.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_set_mapped_authtok.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_set_mapped_username.c | 4 +-
external/bsd/openpam/dist/lib/pam_sm_setcred.c | 4 +-
external/bsd/openpam/dist/lib/pam_start.c | 4 +-
external/bsd/openpam/dist/lib/pam_strerror.c | 4 +-
external/bsd/openpam/dist/lib/pam_verror.c | 4 +-
external/bsd/openpam/dist/lib/pam_vinfo.c | 4 +-
external/bsd/openpam/dist/lib/pam_vprompt.c | 4 +-
external/bsd/openpam/dist/misc/gendoc.pl | 204 ++---
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 | 4 +-
132 files changed, 1317 insertions(+), 2646 deletions(-)
diffs (truncated from 6573 to 300 lines):
diff -r 29f0694b9b67 -r f78881b08acc external/bsd/openpam/dist/bin/pamtest/pamtest.1
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Fri Dec 27 19:27:40 2013 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.1 Fri Dec 27 20:10:20 2013 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pamtest.1,v 1.4 2013/07/20 21:40:04 wiz Exp $
+.\" $NetBSD: pamtest.1,v 1.5 2013/12/27 20:10:20 christos Exp $
.\"
.\"-
.\" Copyright (c) 2011 Dag-Erling Smørgrav
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Id: pamtest.1 610 2012-05-26 14:03:45Z des
+.\" Id: pamtest.1 741 2013-09-07 13:34:02Z des
.\"
-.Dd May 26, 2012
+.Dd September 7, 2013
.Dt PAMTEST 1
.Os
.Sh NAME
@@ -41,6 +41,7 @@
.Op Fl dkMPsv
.Op Fl H Ar rhost
.Op Fl h Ar host
+.Op Fl T Ar timeout
.Op Fl t Ar tty
.Op Fl U Ar ruser
.Op Fl u Ar user
@@ -138,6 +139,9 @@
and
.Xr pam_close_session 3
primitives.
+.It Fl T Ar timeout
+Set the conversation timeout (in seconds) for
+.Xr openpam_ttyconv 3 .
.It Fl t Ar tty
Specify the name of the tty.
The default is to use the result of calling
diff -r 29f0694b9b67 -r f78881b08acc external/bsd/openpam/dist/bin/pamtest/pamtest.c
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.c Fri Dec 27 19:27:40 2013 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.c Fri Dec 27 20:10:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pamtest.c,v 1.3 2013/04/06 02:20:24 christos Exp $ */
+/* $NetBSD: pamtest.c,v 1.4 2013/12/27 20:10:20 christos Exp $ */
/*-
* Copyright (c) 2011 Dag-Erling Smørgrav
@@ -8,8 +8,7 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer
- * in this position and unchanged.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
@@ -29,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * Id: pamtest.c 595 2012-04-14 14:28:35Z des
+ * Id: pamtest.c 685 2013-07-11 16:33:34Z des
*/
#ifdef HAVE_CONFIG_H
@@ -37,6 +36,7 @@
#endif
#include <err.h>
+#include <limits.h>
#include <pwd.h>
#include <stdarg.h>
#include <stdio.h>
@@ -118,6 +118,7 @@
int pame;
flags |= silent;
+ pt_verbose("pam_authenticate()");
if ((pame = pam_authenticate(pamh, flags)) != PAM_SUCCESS)
pt_error(pame, "pam_authenticate()");
return (pame);
@@ -132,6 +133,7 @@
int pame;
flags |= silent;
+ pt_verbose("pam_acct_mgmt()");
if ((pame = pam_acct_mgmt(pamh, flags)) != PAM_SUCCESS)
pt_error(pame, "pam_acct_mgmt()");
return (pame);
@@ -146,6 +148,7 @@
int pame;
flags |= silent;
+ pt_verbose("pam_chauthtok()");
if ((pame = pam_chauthtok(pamh, flags)) != PAM_SUCCESS)
pt_error(pame, "pam_chauthtok()");
return (pame);
@@ -160,6 +163,7 @@
int pame;
flags |= silent;
+ pt_verbose("pam_setcred()");
if ((pame = pam_setcred(pamh, flags)) != PAM_SUCCESS)
pt_error(pame, "pam_setcred()");
return (pame);
@@ -174,6 +178,7 @@
int pame;
flags |= silent;
+ pt_verbose("pam_open_session()");
if ((pame = pam_open_session(pamh, flags)) != PAM_SUCCESS)
pt_error(pame, "pam_open_session()");
return (pame);
@@ -188,6 +193,7 @@
int pame;
flags |= silent;
+ pt_verbose("pam_close_session()");
if ((pame = pam_close_session(pamh, flags)) != PAM_SUCCESS)
pt_error(pame, "pam_close_session()");
return (pame);
@@ -272,6 +278,24 @@
}
/*
+ * Handle an option that takes an int argument and can be used only once
+ */
+static void
+opt_num_once(int opt, long *num, const char *arg)
+{
+ char *end;
+ long l;
+
+ l = strtol(arg, &end, 0);
+ if (end == optarg || *end != '\0') {
+ fprintf(stderr,
+ "The -%c option expects a numeric argument\n", opt);
+ usage();
+ }
+ *num = l;
+}
+
+/*
* Handle an option that takes a string argument and can be used only once
*/
static void
@@ -298,11 +322,12 @@
const char *user = NULL;
const char *service = NULL;
const char *tty = NULL;
+ long timeout = 0;
int keepatit = 0;
int pame;
int opt;
- while ((opt = getopt(argc, argv, "dH:h:kMPst:U:u:v")) != -1)
+ while ((opt = getopt(argc, argv, "dH:h:kMPsT:t:U:u:v")) != -1)
switch (opt) {
case 'd':
openpam_debug++;
@@ -327,6 +352,15 @@
case 's':
silent = PAM_SILENT;
break;
+ case 'T':
+ opt_num_once(opt, &timeout, optarg);
+ if (timeout < 0 || timeout > INT_MAX) {
+ fprintf(stderr,
+ "Invalid conversation timeout\n");
+ usage();
+ }
+ openpam_ttyconv_timeout = (int)timeout;
+ break;
case 't':
opt_str_once(opt, &tty, optarg);
break;
@@ -354,6 +388,8 @@
++argv;
/* defaults */
+ if (service == NULL)
+ service = "pamtest";
if (rhost == NULL) {
if (gethostname(hostname, sizeof(hostname)) == -1)
err(1, "gethostname()");
diff -r 29f0694b9b67 -r f78881b08acc external/bsd/openpam/dist/bin/su/su.1
--- a/external/bsd/openpam/dist/bin/su/su.1 Fri Dec 27 19:27:40 2013 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.1 Fri Dec 27 20:10:20 2013 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: su.1,v 1.4 2013/07/20 21:40:04 wiz Exp $
+.\" $NetBSD: su.1,v 1.5 2013/12/27 20:10:20 christos Exp $
.\"
.\"-
.\" Copyright (c) 2011 Dag-Erling Smørgrav
@@ -28,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" Id: su.1 610 2012-05-26 14:03:45Z des
+.\" Id: su.1 741 2013-09-07 13:34:02Z des
.\"
-.Dd May 26, 2012
+.Dd September 7, 2013
.Dt SU 1
.Os
.Sh NAME
diff -r 29f0694b9b67 -r f78881b08acc external/bsd/openpam/dist/bin/su/su.c
--- a/external/bsd/openpam/dist/bin/su/su.c Fri Dec 27 19:27:40 2013 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.c Fri Dec 27 20:10:20 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: su.c,v 1.3 2013/04/06 02:20:24 christos Exp $ */
+/* $NetBSD: su.c,v 1.4 2013/12/27 20:10:20 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 458 2011-11-02 13:10:25Z des
+ * Id: su.c 648 2013-03-05 17:54:27Z des
*/
#ifdef HAVE_CONFIG_H
diff -r 29f0694b9b67 -r f78881b08acc external/bsd/openpam/dist/doc/man/openpam.3
--- a/external/bsd/openpam/dist/doc/man/openpam.3 Fri Dec 27 19:27:40 2013 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam.3 Fri Dec 27 20:10:20 2013 +0000
@@ -1,124 +1,17 @@
-.\" $NetBSD: openpam.3,v 1.4 2013/07/20 21:40:04 wiz Exp $
-.\"
-.\"-
-.\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
-.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by ThinkSec AS and
-.\" Network Associates Laboratories, the Security Research Division of
-.\" Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
-.\" ("CBOSS"), as part of the DARPA CHATS research program.
+.\" $NetBSD: openpam.3,v 1.5 2013/12/27 20:10:20 christos Exp $
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote
-.\" products derived from this software without specific prior written
-.\" permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" Id
-.\"
-.Dd May 26, 2012
+.\" Generated by gendoc.pl
+.Dd September 7, 2013
.Dt OPENPAM 3
.Os
.Sh NAME
-.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
Home |
Main Index |
Thread Index |
Old Index