[src/trunk]: src/lib/libpam/modules Merge PAM20050226.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b044d4951025
branches:  trunk
changeset: 574289:b044d4951025
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Feb 26 15:57:57 2005 +0000

description:
Merge PAM20050226.

diffstat:

 lib/libpam/modules/pam_krb5/pam_krb5.c       |  15 ++++++++++-----
 lib/libpam/modules/pam_lastlog/pam_lastlog.8 |   4 ++--
 lib/libpam/modules/pam_radius/pam_radius.8   |   6 +++---
 lib/libpam/modules/pam_unix/pam_unix.8       |   4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diffs (121 lines):

diff -r cd34ecb54d49 -r b044d4951025 lib/libpam/modules/pam_krb5/pam_krb5.c
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c    Sat Feb 26 15:39:50 2005 +0000
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c    Sat Feb 26 15:57:57 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pam_krb5.c,v 1.2 2004/12/12 08:18:45 christos Exp $    */
+/*     $NetBSD: pam_krb5.c,v 1.3 2005/02/26 15:57:57 thorpej Exp $     */
 
 /*-
  * This pam_krb5 module contains code that is:
@@ -8,7 +8,7 @@
  *   Copyright (c) Nicolas Williams, 2001. All rights reserved.
  *   Copyright (c) Perot Systems Corporation, 2001. All rights reserved.
  *   Copyright (c) Mark R V Murray, 2001.  All rights reserved.
- *   Copyright (c) Networks Associates Technology, Inc., 2002-2003.
+ *   Copyright (c) Networks Associates Technology, Inc., 2002-2005.
  *       All rights reserved.
  *
  * Portions of this software were developed for the FreeBSD Project by
@@ -51,9 +51,9 @@
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.20 2004/02/10 10:13:20 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.22 2005/01/24 16:49:50 rwatson Exp $");
 #else
-__RCSID("$NetBSD: pam_krb5.c,v 1.2 2004/12/12 08:18:45 christos Exp $");
+__RCSID("$NetBSD: pam_krb5.c,v 1.3 2005/02/26 15:57:57 thorpej Exp $");
 #endif
 
 #include <sys/types.h>
@@ -92,6 +92,7 @@
 #define NEW_PASSWORD_PROMPT    "New Password:"
 
 #define PAM_OPT_CCACHE         "ccache"
+#define PAM_OPT_DEBUG          "debug"
 #define PAM_OPT_FORWARDABLE    "forwardable"
 #define PAM_OPT_NO_CCACHE      "no_ccache"
 #define PAM_OPT_REUSE_CCACHE   "reuse_ccache"
@@ -276,7 +277,7 @@
                goto cleanup;
        }
        krbret = verify_krb_v5_tgt(pam_context, ccache, srvdup,
-           openpam_get_option(pamh, PAM_OPT_FORWARDABLE) ? 1 : 0);
+           openpam_get_option(pamh, PAM_OPT_DEBUG) ? 1 : 0);
        free(srvdup);
        if (krbret == -1) {
                PAM_VERBOSE_ERROR("Kerberos 5 error");
@@ -367,6 +368,10 @@
        if (!(flags & PAM_ESTABLISH_CRED))
                return (PAM_SERVICE_ERR);
 
+       /* If a persistent cache isn't desired, stop now. */
+       if (openpam_get_option(pamh, PAM_OPT_NO_CCACHE))
+               return (PAM_SUCCESS);
+
        PAM_LOG("Establishing credentials");
 
        /* Get username */
diff -r cd34ecb54d49 -r b044d4951025 lib/libpam/modules/pam_lastlog/pam_lastlog.8
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.8      Sat Feb 26 15:39:50 2005 +0000
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.8      Sat Feb 26 15:57:57 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_lastlog.8,v 1.5 2005/02/26 15:05:25 thorpej Exp $
+.\" $NetBSD: pam_lastlog.8,v 1.6 2005/02/26 15:58:35 thorpej Exp $
 .\" Copyright (c) 2001 Mark R V Murray
 .\" All rights reserved.
 .\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -33,7 +33,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.8,v 1.6 2004/07/02 23:52:17 ru Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.8,v 1.7 2005/01/21 10:38:42 ru Exp $
 .\"
 .Dd February 1, 2005
 .Dt PAM_LASTLOG 8
diff -r cd34ecb54d49 -r b044d4951025 lib/libpam/modules/pam_radius/pam_radius.8
--- a/lib/libpam/modules/pam_radius/pam_radius.8        Sat Feb 26 15:39:50 2005 +0000
+++ b/lib/libpam/modules/pam_radius/pam_radius.8        Sat Feb 26 15:57:57 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_radius.8,v 1.3 2005/02/26 15:11:26 thorpej Exp $
+.\" $NetBSD: pam_radius.8,v 1.4 2005/02/26 15:59:08 thorpej Exp $
 .\" Copyright (c) 1999
 .\"    Andrzej Bialecki <abial%FreeBSD.org@localhost>.  All rights reserved.
 .\"
@@ -37,7 +37,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.16 2004/07/02 23:52:18 ru Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.17 2005/02/13 22:25:14 ru Exp $
 .\"
 .Dd October 28, 2002
 .Dt PAM_RADIUS 8
@@ -87,7 +87,7 @@
 specifies a user whose
 .Xr passwd 5
 entry will be used as a template to create the session environment
-if the supplied username doesn't exist in local password database.
+if the supplied username does not exist in local password database.
 The user
 will be authenticated with the supplied username and password, but his
 credentials to the system will be presented as the ones for
diff -r cd34ecb54d49 -r b044d4951025 lib/libpam/modules/pam_unix/pam_unix.8
--- a/lib/libpam/modules/pam_unix/pam_unix.8    Sat Feb 26 15:39:50 2005 +0000
+++ b/lib/libpam/modules/pam_unix/pam_unix.8    Sat Feb 26 15:57:57 2005 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pam_unix.8,v 1.7 2005/02/26 15:39:50 wiz Exp $
+.\" $NetBSD: pam_unix.8,v 1.8 2005/02/26 15:59:34 thorpej Exp $
 .\" Copyright (c) 2001 Mark R V Murray
 .\" All rights reserved.
 .\" Copyright (c) 2001 Networks Associates Technology, Inc.
@@ -33,7 +33,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.10 2004/01/17 09:46:49 schweikh Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.11 2005/01/21 10:44:10 ru Exp $
 .\"
 .Dd February 26, 2005
 .Dt PAM_UNIX 8