-
- /* Not libGL, so just return real dlopen */
- if (STRNCMP_LITERAL (filename, "libGL.so"))
- return dlwrap_real_dlopen (filename, flag);
-
- /* Otherwise, for all libGL lookups we redirectl dlopens to
- * our own library. If we've resolved libfips_handle before,
- * our work is done. */
+ void *ret;
+ unsigned index;
+
+ /* Before deciding whether to redirect this dlopen to our own
+ * library, we call the real dlopen. This assures that any
+ * expected side-effects from loading the intended library are
+ * resolved. Below, we may still return a handle pointing to
+ * our own library, and not what is opened here. */
+ ret = dlwrap_real_dlopen (filename, flag);
+
+ /* If filename is not a wrapped library, just return real dlopen */
+ if (! find_wrapped_library_index (filename, &index))
+ return ret;
+
+ assert (index < ARRAY_SIZE(orig_handles));
+ orig_handles[index] = ret;
+
+ /* Otherwise, we return our own handle so that we can intercept
+ * future calls to dlsym. We encode the index in the return value
+ * so that we can later map back to the originally requested
+ * dlopen-handle if necessary. */