Added thread-pool getkey/setkey functions

[openldap] / libraries / libldap / extended.c

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 58bffe86205d41c491081e00c118669fbb5c5b73..3789720d880d82b92df1cb470adef44aaae2341c 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -30,6 +30,7 @@
 #include <ac/time.h>
 
 #include "ldap-int.h"
+#include "ldap_log.h"
 
 int
 ldap_extended_operation(
@@ -44,7 +45,7 @@ ldap_extended_operation(
        int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_extended_operation\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation\n", 0,0,0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );
 #endif
@@ -60,11 +61,6 @@ ldap_extended_operation(
                return( ld->ld_errno );
        }
 
-       if( reqoid == NULL || *reqoid == '\0' || msgidp == NULL ) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return( ld->ld_errno );
-       }
-
        /* create a message to send */
        if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                ld->ld_errno = LDAP_NO_MEMORY;
@@ -122,7 +118,7 @@ ldap_extended_operation_s(
     LDAPMessage *res;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_extended_operation_s\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation_s\n", 0,0,0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation_s\n", 0, 0, 0 );
 #endif
@@ -132,11 +128,6 @@ ldap_extended_operation_s(
        assert( reqoid != NULL || *reqoid == '\0' );
        assert( retoidp != NULL || retdatap != NULL );
 
-       if( retoidp == NULL || retdatap == NULL ) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return( ld->ld_errno );
-       }
-
     rc = ldap_extended_operation( ld, reqoid, reqdata,
                sctrls, cctrls, &msgid );
         
@@ -148,8 +139,8 @@ ldap_extended_operation_s(
         return( ld->ld_errno );
        }
 
-       *retoidp = NULL;
-       *retdatap = NULL;
+       if ( retoidp != NULL ) *retoidp = NULL;
+       if ( retdatap != NULL ) *retdatap = NULL;
 
        rc = ldap_parse_extended_result( ld, res, retoidp, retdatap, 0 );
 
@@ -183,7 +174,7 @@ ldap_parse_extended_result (
        assert( res != NULL );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_parse_extended_result\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_extended_result\n", 0,0,0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_result\n", 0, 0, 0 );
 #endif
@@ -310,8 +301,7 @@ ldap_parse_extended_partial (
        assert( res != NULL );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, 
-               "ldap_parse_extended_partial\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_extended_partial\n", 0,0,0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_partial\n", 0, 0, 0 );
 #endif