X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodule.c;h=12375773cfae4fcb4a7ca8871a0f8d43b7382f39;hb=4d36fd5a3ed407b0a53004d1431f1669222138b4;hp=0fb5f874ab007e86c9a7e19a5dd6c57e087f3c3c;hpb=f52cc9bab51e427afa3ed5d28be012d8da27a7a8;p=openldap

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 0fb5f874ab..12375773cf 100644
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -41,8 +41,8 @@ int module_init (void)
 	if (lt_dlinit()) {
 		const char *error = lt_dlerror();
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-			   "module_init: lt_ldinit failed: %s\n", error ));
+		LDAP_LOG( SLAPD, CRIT, 
+			"module_init: lt_ldinit failed: %s\n", error, 0, 0 );
 #else
 		Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
 #endif
@@ -62,8 +62,8 @@ int module_kill (void)
 	if (lt_dlexit()) {
 		const char *error = lt_dlerror();
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-			   "module_kill: lt_dlexit failed: %s\n", error ));
+		LDAP_LOG( SLAPD, CRIT, "module_kill: lt_dlexit failed: %s\n", 
+			error, 0, 0 );
 #else
 		Debug(LDAP_DEBUG_ANY, "lt_dlexit failed: %s\n", error, 0, 0);
 #endif
@@ -83,8 +83,8 @@ int module_load(const char* file_name, int argc, char *argv[])
 	module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
 	if (module == NULL) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-			   "module_load:  (%s) out of memory.\n", file_name ));
+		LDAP_LOG( SLAPD, CRIT, 
+			"module_load:  (%s) out of memory.\n", file_name, 0, 0 );
 #else
 		Debug(LDAP_DEBUG_ANY, "module_load failed: (%s) out of memory\n", file_name,
 			0, 0);
@@ -101,9 +101,9 @@ int module_load(const char* file_name, int argc, char *argv[])
 	if ((module->lib = lt_dlopen(file_name)) == NULL) {
 		error = lt_dlerror();
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-			   "module_load: lt_dlopen failed: (%s) %s.\n",
-			   file_name, error ));
+		LDAP_LOG( SLAPD, CRIT, 
+			"module_load: lt_dlopen failed: (%s) %s.\n", 
+			file_name, error, 0 );
 #else
 		Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name,
 			error, 0);
@@ -114,8 +114,7 @@ int module_load(const char* file_name, int argc, char *argv[])
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "module", LDAP_LEVEL_INFO,
-		   "module_load: loaded module %s\n", file_name ));
+	LDAP_LOG( SLAPD, INFO, "module_load: loaded module %s\n", file_name, 0, 0 );
 #else
 	Debug(LDAP_DEBUG_CONFIG, "loaded module %s\n", file_name, 0, 0);
 #endif
@@ -123,9 +122,9 @@ int module_load(const char* file_name, int argc, char *argv[])
    
 	if ((initialize = lt_dlsym(module->lib, "init_module")) == NULL) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-			   "module_load: module %s : no init_module() function found\n",
-			   file_name ));
+		LDAP_LOG( SLAPD, ERR, 
+			"module_load: module %s : no init_module() function found\n",
+		    file_name, 0, 0 );
 #else
 		Debug(LDAP_DEBUG_CONFIG, "module %s: no init_module() function found\n",
 			file_name, 0, 0);
@@ -154,8 +153,8 @@ int module_load(const char* file_name, int argc, char *argv[])
 	rc = initialize(argc, argv);
 	if (rc == -1) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-			   "module_load:  module %s init_module() failed\n", file_name));
+		LDAP_LOG( SLAPD, ERR, 
+			"module_load:  module %s init_module() failed\n", file_name, 0, 0);
 #else
 		Debug(LDAP_DEBUG_CONFIG, "module %s: init_module() failed\n",
 			file_name, 0, 0);
@@ -166,12 +165,13 @@ int module_load(const char* file_name, int argc, char *argv[])
 		return rc;
 	}
 
-	if (rc >= (sizeof(module_regtable) / sizeof(struct module_regtable_t))
+	if (rc >= (int)(sizeof(module_regtable) / sizeof(struct module_regtable_t))
 		|| module_regtable[rc].proc == NULL)
 	{
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-			   "module_load: module %s: unknown registration type (%d).\n", file_name));
+		LDAP_LOG( SLAPD, ERR, 
+			"module_load: module %s: unknown registration type (%d).\n", 
+			file_name, 0);
 #else
 		Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
 			file_name, rc, 0);
@@ -184,9 +184,9 @@ int module_load(const char* file_name, int argc, char *argv[])
 	rc = (module_regtable[rc].proc)(module, file_name);
 	if (rc != 0) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-			   "module_load: module %s:%s could not be registered.\n",
-			   file_name, module_regtable[rc].type ));
+		LDAP_LOG( SLAPD, ERR, 
+			"module_load: module %s:%s could not be registered.\n",
+			file_name, module_regtable[rc].type, 0 );
 #else
 		Debug(LDAP_DEBUG_CONFIG, "module %s: %s module could not be registered\n",
 			file_name, module_regtable[rc].type, 0);
@@ -200,9 +200,9 @@ int module_load(const char* file_name, int argc, char *argv[])
 	module_list = module;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "module", LDAP_LEVEL_INFO,
-		   "module_load: module %s:%s registered\n", file_name,
-		   module_regtable[rc].type ));
+	LDAP_LOG( SLAPD, INFO, 
+		"module_load: module %s:%s registered\n", file_name,
+		module_regtable[rc].type, 0 );
 #else
 	Debug(LDAP_DEBUG_CONFIG, "module %s: %s module registered\n",
 		file_name, module_regtable[rc].type, 0);