Changeset 94 in openpam

Timestamp:

Mar 7, 2002, 8:22:38 PM (19 years ago)

Author:

Dag-Erling Smørgrav

Message:

Fix a number of bugs in the module cache:

• Don't log dlopen() failures, since they're rarely interesting; instead, log a failure if no module was found at all.

• When loading a versioned module, store its logical name in the module structure rather than its physical name, since it will be looked up by its logical name if it's needed again.

• Initialize module->next->prev when adding a module to the cache.

• Set modules to NULL when releasing the last module in the cache.

Sponsored by: DARPA, NAI Labs

Location:

trunk/lib

Files:

• openpam_dynamic.c (modified) (2 diffs)
• openpam_load.c (modified) (3 diffs)

trunk/lib/openpam_dynamic.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#2 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#3 $
  */
 
@@ -65 +65 @@
                 goto buf_err;
         if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
-                openpam_log(PAM_LOG_ERROR, "dlopen(): %s", dlerror());
                 *strrchr(vpath, '.') = '\0';
                 if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
-                        openpam_log(PAM_LOG_ERROR, "dlopen(): %s", dlerror());
                         free(module);
                         return (NULL);
                 }
         }
-        module->path = vpath;
+        free(vpath);
+        if ((module->path = strdup(path)) == NULL)
+                goto buf_err;
         module->dlh = dlh;
         for (i = 0; i < PAM_NUM_PRIMITIVES; ++i)

trunk/lib/openpam_load.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_load.c#11 $
+ * $P4: //depot/projects/openpam/lib/openpam_load.c#12 $
  */
 
@@ -82 +82 @@
         }
 #endif
-        if (module == NULL)
+        if (module == NULL) {
+                openpam_log(PAM_LOG_ERROR, "no %s found", path);
                 return (NULL);
+        }
+        openpam_log(PAM_LOG_DEBUG, "adding %s to cache", module->path);
         module->next = modules;
+        if (module->next != NULL)
+                module->next->prev = module;
         module->prev = NULL;
         modules = module;
@@ -120 +125 @@
         if (module->next != NULL)
                 module->next->prev = module->prev;
+        if (module == modules)
+                modules = module->next;
+        openpam_log(PAM_LOG_DEBUG, "releasing %s", module->path);
         free(module->path);
         free(module);