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/lib For consistency, handle REQUIS...



details:   https://anonhg.NetBSD.org/src/rev/7f7ea4e52aa1
branches:  trunk
changeset: 796444:7f7ea4e52aa1
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jun 03 20:22:54 2014 +0000

description:
For consistency, handle REQUISITE modules the same way as we handle REQUIRED
and BINDING.

diffstat:

 external/bsd/openpam/dist/lib/openpam_configure.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 49dca49a93bb -r 7f7ea4e52aa1 external/bsd/openpam/dist/lib/openpam_configure.c
--- a/external/bsd/openpam/dist/lib/openpam_configure.c Tue Jun 03 20:21:32 2014 +0000
+++ b/external/bsd/openpam/dist/lib/openpam_configure.c Tue Jun 03 20:22:54 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openpam_configure.c,v 1.8 2014/06/03 20:21:32 christos Exp $   */
+/*     $NetBSD: openpam_configure.c,v 1.9 2014/06/03 20:22:54 christos Exp $   */
 
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -470,18 +470,19 @@
        }
 #ifdef __NetBSD__
        /*
-        * On NetBSD we require the AUTH chain to have a binding
-        * or a required module.
+        * On NetBSD we require the AUTH chain to have a binding,
+        * a required, or requisite module.
         */
        {
                pam_chain_t *this = pamh->chains[PAM_AUTH];
                for (; this != NULL; this = this->next)
                        if (this->flag == PAM_BINDING ||
-                           this->flag == PAM_REQUIRED)
+                           this->flag == PAM_REQUIRED ||
+                           this->flag == PAM_REQUISITE)
                                break;
                if (this == NULL) {
                        openpam_log(PAM_LOG_ERROR,
-                           "No required or binding component "
+                           "No required, requisite, or binding component "
                            "in service %s, facility %s",
                            service, pam_facility_name[PAM_AUTH]);
                        goto load_err;



Home | Main Index | Thread Index | Old Index