Patch: Wrong args to Debug() and LDAP_LOG() (ITS#2170,2171)

			================
Written by Hallvard B. Furuseth and placed into the public domain.
This software is not subject to any license of the University of Oslo.
			================

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index bda792fbf84ae5785885c99288fd3f7a3dc549df..1dc199c838d8910bc5d9cdb46ff1c6899725bd8d 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -467,7 +467,7 @@ int main( int argc, char **argv )
 #else
                Debug( LDAP_DEBUG_ANY,
                    "main: TLS init def ctx failed: %d\n",
-                   0, 0, 0 );
+                   rc, 0, 0 );
 #endif
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 12375773cfae4fcb4a7ca8871a0f8d43b7382f39..2dd747458d605f25b2539437d82df571e20083da 100644 (file)
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -171,7 +171,7 @@ int module_load(const char* file_name, int argc, char *argv[])
 #ifdef NEW_LOGGING
                LDAP_LOG( SLAPD, ERR, 
                        "module_load: module %s: unknown registration type (%d).\n", 
-                       file_name, 0);
+                       file_name, rc, 0);
 #else
                Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
                        file_name, rc, 0);