Changeset 893 in openpam

Timestamp:

Jan 17, 2017, 2:19:04 PM (4 years ago)

Author:

Dag-Erling Smørgrav

Message:

merge r862: add control flag for fallback to "other" policy

Location:

branches/nooath

Files:

• . (modified) (1 prop)
• include/security/openpam.h (modified) (1 diff)
• lib/libpam/openpam_configure.c (modified) (1 diff)
• lib/libpam/openpam_features.c (modified) (1 diff)

branches/nooath/include/security/openpam.h

@@ -187 +187 @@
         OPENPAM_RESTRICT_MODULE_NAME,
         OPENPAM_VERIFY_MODULE_FILE,
+        OPENPAM_FALLBACK_TO_OTHER,
         OPENPAM_NUM_FEATURES
 };

branches/nooath/lib/libpam/openpam_configure.c

@@ -464 +464 @@
                 if (pamh->chains[fclt] != NULL)
                         continue;
-                if (openpam_load_chain(pamh, PAM_OTHER, fclt) < 0)
-                        goto load_err;
+                if (OPENPAM_FEATURE(FALLBACK_TO_OTHER)) {
+                        if (openpam_load_chain(pamh, PAM_OTHER, fclt) < 0)
+                                goto load_err;
+                }
         }
         RETURNC(PAM_SUCCESS);

branches/nooath/lib/libpam/openpam_features.c

@@ -66 +66 @@
             1
         ),
+        STRUCT_OPENPAM_FEATURE(
+            FALLBACK_TO_OTHER,
+            "Fall back to \"other\" policy for empty chains",
+            1
+        ),
 };