Add O_EXCL

[openldap] / libraries / libldap / sasl.c

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 93a52472f8e41630b0b8f01847e36cae27f9a7a9..e5c64921d5ad82c57ea6ce2b52107d1ea8dd7d30 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -62,7 +62,7 @@ ldap_sasl_bind(
        int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind\n" ));
+       LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );
 #endif
@@ -75,11 +75,6 @@ ldap_sasl_bind(
        rc = ldap_int_client_controls( ld, cctrls );
        if( rc != LDAP_SUCCESS ) return rc;
 
-       if( msgidp == NULL ) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return ld->ld_errno;
-       }
-
        if( mechanism == LDAP_SASL_SIMPLE ) {
                if( dn == NULL && cred != NULL ) {
                        /* use default binddn */
@@ -174,7 +169,7 @@ ldap_sasl_bind_s(
        struct berval   *scredp = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind_s\n" ));
+       LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 );
 #endif
@@ -260,7 +255,7 @@ ldap_parse_sasl_bind_result(
        BerElement      *ber;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_parse_sasl_bind_result\n" ));
+       LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
 #endif
@@ -269,10 +264,6 @@ ldap_parse_sasl_bind_result(
        assert( LDAP_VALID( ld ) );
        assert( res != NULL );
 
-       if ( ld == NULL || res == NULL ) {
-               return LDAP_PARAM_ERROR;
-       }
-
        if( servercredp != NULL ) {
                if( ld->ld_version < LDAP_VERSION2 ) {
                        return LDAP_NOT_SUPPORTED;
@@ -377,7 +368,7 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
        int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_getmech\n" ));
+       LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
 #endif
@@ -465,8 +456,9 @@ ldap_sasl_interactive_bind_s(
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1, 
-                       "ldap_interactive_sasl_bind_s: server supports: %s\n", smechs ));
+               LDAP_LOG ( TRANSPORT, DETAIL1, 
+                       "ldap_interactive_sasl_bind_s: server supports: %s\n", 
+                       smechs, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "ldap_interactive_sasl_bind_s: server supports: %s\n",
@@ -477,8 +469,8 @@ ldap_sasl_interactive_bind_s(
 
        } else {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1, 
-                       "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs ));
+               LDAP_LOG ( TRANSPORT, DETAIL1, 
+                       "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "ldap_interactive_sasl_bind_s: user selected: %s\n",