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/a3c490ad0d34
branches:  trunk
changeset: 785909:a3c490ad0d34
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 06 02:20:24 2013 +0000

description:
merge conflicts

diffstat:

 external/bsd/openpam/dist/bin/pamtest/pamtest.1               |   22 +-
 external/bsd/openpam/dist/bin/pamtest/pamtest.c               |   21 +-
 external/bsd/openpam/dist/bin/su/su.1                         |   13 +-
 external/bsd/openpam/dist/bin/su/su.c                         |    4 +-
 external/bsd/openpam/dist/doc/man/openpam.3                   |   29 +-
 external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3       |   18 +-
 external/bsd/openpam/dist/doc/man/openpam_free_data.3         |   16 +-
 external/bsd/openpam/dist/doc/man/openpam_free_envlist.3      |   17 +-
 external/bsd/openpam/dist/doc/man/openpam_get_option.3        |   18 +-
 external/bsd/openpam/dist/doc/man/openpam_log.3               |   19 +-
 external/bsd/openpam/dist/doc/man/openpam_nullconv.3          |   18 +-
 external/bsd/openpam/dist/doc/man/openpam_readline.3          |   38 +-
 external/bsd/openpam/dist/doc/man/openpam_restore_cred.3      |   18 +-
 external/bsd/openpam/dist/doc/man/openpam_set_option.3        |   18 +-
 external/bsd/openpam/dist/doc/man/openpam_subst.3             |   24 +-
 external/bsd/openpam/dist/doc/man/openpam_ttyconv.3           |   28 +-
 external/bsd/openpam/dist/doc/man/pam.3                       |    9 +-
 external/bsd/openpam/dist/doc/man/pam.conf.5                  |   12 +-
 external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3             |   18 +-
 external/bsd/openpam/dist/doc/man/pam_authenticate.3          |   20 +-
 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                  |    9 +-
 external/bsd/openpam/dist/doc/man/pam_end.3                   |   19 +-
 external/bsd/openpam/dist/doc/man/pam_error.3                 |   18 +-
 external/bsd/openpam/dist/doc/man/pam_get_authtok.3           |   24 +-
 external/bsd/openpam/dist/doc/man/pam_get_data.3              |   18 +-
 external/bsd/openpam/dist/doc/man/pam_get_item.3              |   18 +-
 external/bsd/openpam/dist/doc/man/pam_get_user.3              |   20 +-
 external/bsd/openpam/dist/doc/man/pam_getenv.3                |   16 +-
 external/bsd/openpam/dist/doc/man/pam_getenvlist.3            |   16 +-
 external/bsd/openpam/dist/doc/man/pam_info.3                  |   18 +-
 external/bsd/openpam/dist/doc/man/pam_open_session.3          |   18 +-
 external/bsd/openpam/dist/doc/man/pam_prompt.3                |   18 +-
 external/bsd/openpam/dist/doc/man/pam_putenv.3                |   18 +-
 external/bsd/openpam/dist/doc/man/pam_set_data.3              |   16 +-
 external/bsd/openpam/dist/doc/man/pam_set_item.3              |   16 +-
 external/bsd/openpam/dist/doc/man/pam_setcred.3               |   18 +-
 external/bsd/openpam/dist/doc/man/pam_setenv.3                |   20 +-
 external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3          |   16 +-
 external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3       |   16 +-
 external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3          |   16 +-
 external/bsd/openpam/dist/doc/man/pam_sm_close_session.3      |   16 +-
 external/bsd/openpam/dist/doc/man/pam_sm_open_session.3       |   16 +-
 external/bsd/openpam/dist/doc/man/pam_sm_setcred.3            |   16 +-
 external/bsd/openpam/dist/doc/man/pam_start.3                 |   16 +-
 external/bsd/openpam/dist/doc/man/pam_strerror.3              |   16 +-
 external/bsd/openpam/dist/doc/man/pam_verror.3                |   18 +-
 external/bsd/openpam/dist/doc/man/pam_vinfo.3                 |   18 +-
 external/bsd/openpam/dist/doc/man/pam_vprompt.3               |   18 +-
 external/bsd/openpam/dist/include/security/openpam.h          |   45 +-
 external/bsd/openpam/dist/include/security/openpam_attr.h     |    4 +-
 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           |    4 +-
 external/bsd/openpam/dist/lib/openpam_check_owner_perms.c     |   34 +-
 external/bsd/openpam/dist/lib/openpam_configure.c             |  608 +++------
 external/bsd/openpam/dist/lib/openpam_constants.c             |    4 +-
 external/bsd/openpam/dist/lib/openpam_constants.h             |   11 +-
 external/bsd/openpam/dist/lib/openpam_debug.h                 |   47 +-
 external/bsd/openpam/dist/lib/openpam_dispatch.c              |    4 +-
 external/bsd/openpam/dist/lib/openpam_dynamic.c               |  109 +-
 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          |    4 +-
 external/bsd/openpam/dist/lib/openpam_get_option.c            |    5 +-
 external/bsd/openpam/dist/lib/openpam_impl.h                  |   20 +-
 external/bsd/openpam/dist/lib/openpam_load.c                  |    8 +-
 external/bsd/openpam/dist/lib/openpam_log.c                   |   15 +-
 external/bsd/openpam/dist/lib/openpam_nullconv.c              |    4 +-
 external/bsd/openpam/dist/lib/openpam_readline.c              |   53 +-
 external/bsd/openpam/dist/lib/openpam_restore_cred.c          |    4 +-
 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               |    9 +-
 external/bsd/openpam/dist/lib/openpam_subst.c                 |    7 +-
 external/bsd/openpam/dist/lib/openpam_ttyconv.c               |   16 +-
 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               |   14 +-
 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                  |    4 +-
 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                    |    6 +-
 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                    |    6 +-
 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                      |  121 +-
 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 +-
 external/bsd/openpam/openpam2netbsd                           |   11 +-
 127 files changed, 1188 insertions(+), 1095 deletions(-)

diffs (truncated from 5920 to 300 lines):

diff -r f9f933abf094 -r a3c490ad0d34 external/bsd/openpam/dist/bin/pamtest/pamtest.1
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.1   Sat Apr 06 02:20:01 2013 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.1   Sat Apr 06 02:20:24 2013 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pamtest.1,v 1.2 2011/12/25 22:27:55 christos Exp $
+.\"    $NetBSD: pamtest.1,v 1.3 2013/04/06 02:20:24 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2011 Dag-Erling Smørgrav
@@ -12,6 +12,9 @@
 .\" 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
@@ -25,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" Id: pamtest.1 471 2011-11-03 09:44:40Z des
+.\" Id: pamtest.1 610 2012-05-26 14:03:45Z des 
 .\"
-.Dd November 2, 2011
+.Dd May 26, 2012
 .Dt PAMTEST 1
 .Os
 .Sh NAME
@@ -35,7 +38,7 @@
 .Nd PAM policy tester
 .Sh SYNOPSYS
 .Nm
-.Op Fl dksv
+.Op Fl dkMPsv
 .Op Fl H Ar rhost
 .Op Fl h Ar host
 .Op Fl t Ar tty
@@ -118,6 +121,11 @@
 .Xr gethostname 3 .
 .It Fl k
 Keep going even if one of the commands fails.
+.It Fl M
+Disable path, ownership and permission checks on module files.
+.It Fl P
+Disable service name validation and path, ownership and permission
+checks on policy files.
 .It Fl s
 Set the
 .Dv PAM_SILENT
@@ -151,14 +159,14 @@
 pamtest -v system auth account change setcred open close unsetcred
 .Ed
 .Sh SEE ALSO
-.Xr openpam 3
-.Xr pam 3
+.Xr openpam 3 ,
+.Xr pam 3 ,
 .Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des%FreeBSD.org@localhost .
+.An Dag-Erling Sm\(/orgrav Aq des%des.no@localhost .
 .Sh BUGS
 The
 .Nm
diff -r f9f933abf094 -r a3c490ad0d34 external/bsd/openpam/dist/bin/pamtest/pamtest.c
--- a/external/bsd/openpam/dist/bin/pamtest/pamtest.c   Sat Apr 06 02:20:01 2013 +0000
+++ b/external/bsd/openpam/dist/bin/pamtest/pamtest.c   Sat Apr 06 02:20:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pamtest.c,v 1.2 2011/12/25 22:27:55 christos Exp $     */
+/*     $NetBSD: pamtest.c,v 1.3 2013/04/06 02:20:24 christos Exp $     */
 
 /*-
  * Copyright (c) 2011 Dag-Erling Smørgrav
@@ -13,6 +13,9 @@
  * 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
@@ -26,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Id: pamtest.c 472 2011-11-03 09:46:52Z des
+ * Id: pamtest.c 595 2012-04-14 14:28:35Z des 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -263,8 +266,8 @@
 usage(void)
 {
 
-       fprintf(stderr, "usage: pamtest [-dksv] %s\n",
-           "[-H rhost] [-h host] [-t tty] [-U ruser] [-u user] service");
+       fprintf(stderr, "usage: pamtest %s service command ...\n",
+           "[-dkMPsv] [-H rhost] [-h host] [-t tty] [-U ruser] [-u user]");
        exit(1);
 }
 
@@ -299,7 +302,7 @@
        int pame;
        int opt;
 
-       while ((opt = getopt(argc, argv, "dH:h:kst:U:u:v")) != -1)
+       while ((opt = getopt(argc, argv, "dH:h:kMPst:U:u:v")) != -1)
                switch (opt) {
                case 'd':
                        openpam_debug++;
@@ -313,6 +316,14 @@
                case 'k':
                        keepatit = 1;
                        break;
+               case 'M':
+                       openpam_set_feature(OPENPAM_RESTRICT_MODULE_NAME, 0);
+                       openpam_set_feature(OPENPAM_VERIFY_MODULE_FILE, 0);
+                       break;
+               case 'P':
+                       openpam_set_feature(OPENPAM_RESTRICT_SERVICE_NAME, 0);
+                       openpam_set_feature(OPENPAM_VERIFY_POLICY_FILE, 0);
+                       break;
                case 's':
                        silent = PAM_SILENT;
                        break;
diff -r f9f933abf094 -r a3c490ad0d34 external/bsd/openpam/dist/bin/su/su.1
--- a/external/bsd/openpam/dist/bin/su/su.1     Sat Apr 06 02:20:01 2013 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.1     Sat Apr 06 02:20:24 2013 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: su.1,v 1.2 2011/12/25 22:27:55 christos Exp $
+.\"    $NetBSD: su.1,v 1.3 2013/04/06 02:20:24 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2011 Dag-Erling Smørgrav
@@ -12,6 +12,9 @@
 .\" 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
@@ -25,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" Id: su.1 458 2011-11-02 13:10:25Z des
+.\" Id: su.1 610 2012-05-26 14:03:45Z des 
 .\"
-.Dd November 2, 2011
+.Dd May 26, 2012
 .Dt SU 1
 .Os
 .Sh NAME
@@ -55,10 +58,10 @@
 utility is provided with the OpenPAM library as a sample application
 and should not be used in production systems.
 .Sh SEE ALSO
-.Xr openpam 3
+.Xr openpam 3 ,
 .Xr pam 3
 .Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des%FreeBSD.org@localhost .
+.An Dag-Erling Sm\(/orgrav Aq des%des.no@localhost .
diff -r f9f933abf094 -r a3c490ad0d34 external/bsd/openpam/dist/bin/su/su.c
--- a/external/bsd/openpam/dist/bin/su/su.c     Sat Apr 06 02:20:01 2013 +0000
+++ b/external/bsd/openpam/dist/bin/su/su.c     Sat Apr 06 02:20:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: su.c,v 1.2 2011/12/25 22:27:55 christos Exp $  */
+/*     $NetBSD: su.c,v 1.3 2013/04/06 02:20:24 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 458 2011-11-02 13:10:25Z des 
  */
 
 #ifdef HAVE_CONFIG_H
diff -r f9f933abf094 -r a3c490ad0d34 external/bsd/openpam/dist/doc/man/openpam.3
--- a/external/bsd/openpam/dist/doc/man/openpam.3       Sat Apr 06 02:20:01 2013 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam.3       Sat Apr 06 02:20:24 2013 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: openpam.3,v 1.2 2011/12/25 22:27:55 christos Exp $
+.\"    $NetBSD: openpam.3,v 1.3 2013/04/06 02:20:25 christos Exp $
 .\"
 .\"-
 .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -36,19 +36,24 @@
 .\"
 .\" Id
 .\"
-.Dd December 18, 2011
+.Dd May 26, 2012
 .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 ,
@@ -70,6 +75,8 @@
 .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"
@@ -78,11 +85,19 @@
 .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"
@@ -103,7 +118,7 @@
 .Ft "int"
 .Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
 .\"
-.\" Id: openpam.man 320 2006-02-16 20:33:19Z des
+.\" Id: openpam.man 320 2006-02-16 20:33:19Z des 
 .\"
 .Sh DESCRIPTION
 These functions are OpenPAM extensions to the PAM API.
@@ -119,12 +134,17 @@
 .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 ,
@@ -148,3 +168,6 @@
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 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 .
diff -r f9f933abf094 -r a3c490ad0d34 external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3
--- a/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3   Sat Apr 06 02:20:01 2013 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3   Sat Apr 06 02:20:24 2013 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: openpam_borrow_cred.3,v 1.2 2011/12/25 22:27:55 christos Exp $
+.\"    $NetBSD: openpam_borrow_cred.3,v 1.3 2013/04/06 02:20:25 christos Exp $
 .\"



Home | Main Index | Thread Index | Old Index