Add O_EXCL

[openldap] / libraries / libldap / getdn.c

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index bec27bc7da976d604480652f8fc4f733f99e5bb1..781dca07afe6450849247111e1a12ed1e7caf525 100644 (file)
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -85,15 +85,14 @@ ldap_get_dn( LDAP *ld, LDAPMessage *entry )
        BerElement      tmp;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_get_dn\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_get_dn\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_get_dn\n", 0, 0, 0 );
 #endif
 
-       if ( entry == NULL ) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return( NULL );
-       }
+       assert( ld != NULL );
+       assert( LDAP_VALID(ld) );
+       assert( entry != NULL );
 
        tmp = *entry->lm_ber;   /* struct copy */
        if ( ber_scanf( &tmp, "{a" /*}*/, &dn ) == LBER_ERROR ) {
@@ -113,7 +112,7 @@ ldap_dn2ufn( LDAP_CONST char *dn )
        char    *out = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2ufn\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_dn2ufn\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_dn2ufn\n", 0, 0, 0 );
 #endif
@@ -136,7 +135,7 @@ ldap_explode_dn( LDAP_CONST char *dn, int notypes )
        unsigned flag = notypes ? LDAP_DN_FORMAT_UFN : LDAP_DN_FORMAT_LDAPV3;
        
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_explode_dn\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_explode_dn\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_explode_dn\n", 0, 0, 0 );
 #endif
@@ -180,7 +179,7 @@ ldap_explode_rdn( LDAP_CONST char *rdn, int notypes )
        int             iAVA;
        
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_explode_rdn\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_explode_rdn\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_explode_rdn\n", 0, 0, 0 );
 #endif
@@ -265,7 +264,7 @@ ldap_dn2dcedn( LDAP_CONST char *dn )
        char    *out = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2dcedn\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_dn2dcedn\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_dn2dcedn\n", 0, 0, 0 );
 #endif
@@ -282,7 +281,7 @@ ldap_dcedn2dn( LDAP_CONST char *dce )
        char    *out = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dcedn2dn\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_dcedn2dn\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_dcedn2dn\n", 0, 0, 0 );
 #endif
@@ -298,7 +297,7 @@ ldap_dn2ad_canonical( LDAP_CONST char *dn )
        char    *out = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn2ad_canonical\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_dn2ad_canonical\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_dn2ad_canonical\n", 0, 0, 0 );
 #endif
@@ -334,7 +333,7 @@ ldap_dn_normalize( LDAP_CONST char *dnin,
        LDAPDN  *tmpDN = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ENTRY, "ldap_dn_normalize\n" ));
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_dn_normalize\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_dn_normalize\n", 0, 0, 0 );
 #endif
@@ -661,8 +660,7 @@ ldap_bv2dn( struct berval *bv, LDAPDN **dn, unsigned flags )
        assert( dn );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ARGS, "ldap_bv2dn(%s,%u)\n%s", 
-               str, flags, "" ));
+       LDAP_LOG ( OPERATION, ARGS, "ldap_bv2dn(%s,%u)\n%s", str, flags, "" );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> ldap_bv2dn(%s,%u)\n%s", str, flags, "" );
 #endif
@@ -838,8 +836,8 @@ return_result:;
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_RESULTS, "<= ldap_bv2dn(%s,%u)=%d\n", 
-               str, flags, rc ));
+       LDAP_LOG ( OPERATION, RESULTS, "<= ldap_bv2dn(%s,%u)=%d\n", 
+               str, flags, rc );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= ldap_bv2dn(%s,%u)=%d\n", str, flags, rc );
 #endif
@@ -2878,7 +2876,7 @@ ldap_rdn2bv( LDAPRDN *rdn, struct berval *bv, unsigned flags )
                break;
 
        default:
-               return( LDAP_PARAM_ERROR );
+               return LDAP_PARAM_ERROR;
        }
 
        bv->bv_val = LDAP_MALLOC( l + 1 );
@@ -2968,8 +2966,8 @@ int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags )
        bv->bv_val = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_ARGS, "=> ldap_dn2bv(%u)\n%s%s", 
-               flags, "", "" ));
+       LDAP_LOG ( OPERATION, ARGS, "=> ldap_dn2bv(%u)\n%s%s", 
+               flags, "", "" );
 #else
        Debug( LDAP_DEBUG_TRACE, "=> ldap_dn2bv(%u)\n%s%s", flags, "", "" );
 #endif
@@ -3280,8 +3278,8 @@ int ldap_dn2bv( LDAPDN *dn, struct berval *bv, unsigned flags )
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "getdn", LDAP_LEVEL_RESULTS, "<= ldap_dn2bv(%s,%u)=%d\n", 
-               bv->bv_val, flags, rc ));
+       LDAP_LOG ( OPERATION, RESULTS, "<= ldap_dn2bv(%s,%u)=%d\n", 
+               bv->bv_val, flags, rc );
 #else
        Debug( LDAP_DEBUG_TRACE, "<= ldap_dn2bv(%s,%u)=%d\n",
                bv->bv_val, flags, rc );