VLV clean

[openldap] / libraries / libldap / extended.c

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 49256185929d5fa0b553e01952754d0c4b0f6f79..74e31281ca592d0464906b10ea07ea706d1ebc60 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -43,7 +43,11 @@ ldap_extended_operation(
        BerElement *ber;
        int rc;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_extended_operation\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -56,11 +60,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;
@@ -117,18 +116,17 @@ ldap_extended_operation_s(
     int     msgid;
     LDAPMessage *res;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_extended_operation_s\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation_s\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
        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 );
         
@@ -174,7 +172,11 @@ ldap_parse_extended_result (
        assert( LDAP_VALID( ld ) );
        assert( res != NULL );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, "ldap_parse_extended_result\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_result\n", 0, 0, 0 );
+#endif
 
        if( ld->ld_version < LDAP_VERSION3 ) {
                ld->ld_errno = LDAP_NOT_SUPPORTED;
@@ -297,7 +299,12 @@ ldap_parse_extended_partial (
        assert( LDAP_VALID( ld ) );
        assert( res != NULL );
 
-       Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_result\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "extended", LDAP_LEVEL_ENTRY, 
+               "ldap_parse_extended_partial\n" ));
+#else
+       Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_partial\n", 0, 0, 0 );
+#endif
 
        if( ld->ld_version < LDAP_VERSION3 ) {
                ld->ld_errno = LDAP_NOT_SUPPORTED;