allow 'all' vs. 'any' sasl-authz-policy

[openldap] / servers / slapd / module.c

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 64e4c1188371bd188009df26002a1c0329530e50..b4682b4dfce0096f2fbedcecca49047b3142386c 100644 (file)
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -1,8 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #include "portable.h"
 #include <stdio.h>
 #include "slap.h"
@@ -40,13 +50,22 @@ module_loaded_t *module_list = NULL;
 
 static int module_unload (module_loaded_t *module);
 
+#ifdef HAVE_EBCDIC
+static char ebuf[BUFSIZ];
+#endif
+
 int module_init (void)
 {
        if (lt_dlinit()) {
                const char *error = lt_dlerror();
+#ifdef HAVE_EBCDIC
+               strcpy( ebuf, error );
+               __etoa( ebuf );
+               error = ebuf;
+#endif
 #ifdef NEW_LOGGING
                LDAP_LOG( SLAPD, CRIT, 
-                       "module_init: lt_ldinit failed: %s\n", error, 0, 0 );
+                       "module_init: lt_dlinit failed: %s\n", error, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
 #endif
@@ -65,6 +84,11 @@ int module_kill (void)
 
        if (lt_dlexit()) {
                const char *error = lt_dlerror();
+#ifdef HAVE_EBCDIC
+               strcpy( ebuf, error );
+               __etoa( ebuf );
+               error = ebuf;
+#endif
 #ifdef NEW_LOGGING
                LDAP_LOG( SLAPD, CRIT, "module_kill: lt_dlexit failed: %s\n", 
                        error, 0, 0 );
@@ -83,6 +107,11 @@ int module_load(const char* file_name, int argc, char *argv[])
        const char *error;
        int rc;
        MODULE_INIT_FN initialize;
+#ifdef HAVE_EBCDIC
+#define        file    ebuf
+#else
+#define        file    file_name
+#endif
 
        module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
        if (module == NULL) {
@@ -97,19 +126,28 @@ int module_load(const char* file_name, int argc, char *argv[])
                return -1;
        }
 
+#ifdef HAVE_EBCDIC
+       strcpy( file, file_name );
+       __atoe( file );
+#endif
        /*
         * The result of lt_dlerror(), when called, must be cached prior
         * to calling Debug. This is because Debug is a macro that expands
         * into multiple function calls.
         */
-       if ((module->lib = lt_dlopen(file_name)) == NULL) {
+       if ((module->lib = lt_dlopenext(file)) == NULL) {
                error = lt_dlerror();
+#ifdef HAVE_EBCDIC
+               strcpy( ebuf, error );
+               __etoa( ebuf );
+               error = ebuf;
+#endif
 #ifdef NEW_LOGGING
                LDAP_LOG( SLAPD, CRIT, 
-                       "module_load: lt_dlopen failed: (%s) %s.\n", 
+                       "module_load: lt_dlopenext failed: (%s) %s.\n", 
                        file_name, error, 0 );
 #else
-               Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name,
+               Debug(LDAP_DEBUG_ANY, "lt_dlopenext failed: (%s) %s\n", file_name,
                        error, 0);
 #endif
 
@@ -124,7 +162,13 @@ int module_load(const char* file_name, int argc, char *argv[])
 #endif
 
    
+#ifdef HAVE_EBCDIC
+#pragma convlit(suspend)
+#endif
        if ((initialize = lt_dlsym(module->lib, "init_module")) == NULL) {
+#ifdef HAVE_EBCDIC
+#pragma convlit(resume)
+#endif
 #ifdef NEW_LOGGING
                LDAP_LOG( SLAPD, ERR, 
                        "module_load: module %s : no init_module() function found\n",
@@ -217,11 +261,21 @@ int module_load(const char* file_name, int argc, char *argv[])
 
 int module_path(const char *path)
 {
+#ifdef HAVE_EBCDIC
+       strcpy(ebuf, path);
+       __atoe(ebuf);
+       path = ebuf;
+#endif
        return lt_dlsetsearchpath( path );
 }
 
 void *module_resolve (const void *module, const char *name)
 {
+#ifdef HAVE_EBCDIC
+       strcpy(ebuf, name);
+       __atoe(ebuf);
+       name = ebuf;
+#endif
        if (module == NULL || name == NULL)
                return(NULL);
        return(lt_dlsym(((module_loaded_t *)module)->lib, name));
@@ -246,7 +300,13 @@ static int module_unload (module_loaded_t *module)
                }
 
                /* call module's terminate routine, if present */
+#ifdef HAVE_EBCDIC
+#pragma convlit(suspend)
+#endif
                if ((terminate = lt_dlsym(module->lib, "term_module"))) {
+#ifdef HAVE_EBCDIC
+#pragma convlit(resume)
+#endif
                        terminate();
                }