Add O_EXCL

[openldap] / libraries / libldap / extended.c

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 74e31281ca592d0464906b10ea07ea706d1ebc60..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
@@ -117,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
@@ -138,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 );
 
@@ -173,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
@@ -300,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