Changeset 672 in openpam for trunk/lib/libpam

Timestamp:

Mar 17, 2013, 7:42:33 PM (8 years ago)

Author:

Dag-Erling Smørgrav

Message:

Make the .so suffix optional, so these three lines are now equivalent:

auth required pam_unix.so.2 try_first_pass
auth required pam_unix.so try_first_pass
auth required pam_unix try_first_pass

File:

• trunk/lib/libpam/openpam_dynamic.c (modified) (5 diffs)

trunk/lib/libpam/openpam_dynamic.c

@@ -54 +54 @@
 #include "openpam_impl.h"
 #include "openpam_asprintf.h"
+#include "openpam_ctype.h"
 #include "openpam_dlfunc.h"
 
@@ -177 +178 @@
         pam_module_t *module;
         char modpath[PATH_MAX];
-        const char **path;
+        const char **path, *p;
+        int has_so, has_ver;
         int dot, len;
 
@@ -198 +200 @@
 
         /*
+         * Check for .so and version sufixes
+         */
+        p = strchr(modname, '\0');
+        has_ver = has_so = 1;
+        while (is_digit(*p))
+                --p;
+        if (*p == '.' && *++p != '\0') {
+                /* found a numeric suffix */
+                has_ver = 1;
+                /* assume that .so is either present or unneeded */
+                has_so = 1;
+        } else if (*p == '\0' && p >= modname + sizeof PAM_SOEXT &&
+            strcmp(p - sizeof PAM_SOEXT + 1, PAM_SOEXT) == 0) {
+                /* found .so suffix */
+                has_so = 1;
+        }
+
+        /*
          * Complicated case: search for the module in the usual places.
          */
@@ -205 +225 @@
                  * note of where the suffix begins so we can cut it off later.
                  */
-                len = snprintf(modpath, sizeof modpath, "%s/%s%n.%d",
-                    *path, modname, &dot, LIB_MAJ);
+                if (has_ver)
+                        len = snprintf(modpath, sizeof modpath, "%s/%s%n",
+                            *path, modname, &dot);
+                else if (has_so)
+                        len = snprintf(modpath, sizeof modpath, "%s/%s%n.%d",
+                            *path, modname, &dot, LIB_MAJ);
+                else
+                        len = snprintf(modpath, sizeof modpath, "%s/%s%s%n.%d",
+                            *path, modname, PAM_SOEXT, &dot, LIB_MAJ);
+                /* check for overflow */
                 if (len < 0 || (unsigned int)len >= sizeof modpath) {
                         errno = ENOENT;
@@ -214 +242 @@
                 if ((module = try_module(modpath)) != NULL)
                         return (module);
-                if (errno == ENOENT) {
+                if (errno == ENOENT && modpath[dot] != '\0') {
                         /* no luck, try the unversioned path */
                         modpath[dot] = '\0';