Fix previous commit

[openldap] / servers / slapd / saslauthz.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index e28288511b73a8bb970ea52a49946e24095a58ff..8d6b1210061d9ef41d139afe5740bbfbb1b3254e 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -286,13 +286,13 @@ char *slap_sasl_regexp( char *saslname )
 /* Two empty callback functions to avoid sending results */
 static void sasl_sc_r( Connection *conn, Operation *o, ber_tag_t tag,
        ber_int_t msgid, ber_int_t err, const char *matched,
-       const char *text, BVarray ref, const char *resoid,
+       const char *text, BerVarray ref, const char *resoid,
        struct berval *resdata, struct berval *sasldata, LDAPControl **c)
 {
 }
 
 static void sasl_sc_s( Connection *conn, Operation *o, ber_int_t err,
-       const char *matched, const char *text, BVarray refs, LDAPControl **c,
+       const char *matched, const char *text, BerVarray refs, LDAPControl **c,
        int nentries)
 {
 }
@@ -456,10 +456,10 @@ int slap_sasl_match( char *rule, struct berval *assertDN, char *authc )
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-               "slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule ));
+               "slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule ));
 #else
        Debug( LDAP_DEBUG_TRACE,
-          "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule, 0 );
+          "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule, 0 );
 #endif
 
        rc = slap_parseURI( rule, &searchbase, &scope, &filter );
@@ -550,18 +550,18 @@ slap_sasl_check_authz(char *searchDN, char *assertDN, struct berval *attr, char
 {
        const char *errmsg;
        int i, rc;
-       BVarray vals=NULL;
+       BerVarray vals=NULL;
        AttributeDescription *ad=NULL;
        struct berval bv;
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
                   "slap_sasl_check_authz: does %s match %s rule in %s?\n",
-                  assertDN, attr, searchDN ));
+                  assertDN, attr->bv_val, searchDN ));
 #else
        Debug( LDAP_DEBUG_TRACE,
           "==>slap_sasl_check_authz: does %s match %s rule in %s?\n",
-          assertDN, attr, searchDN);
+          assertDN, attr->bv_val, searchDN);
 #endif
 
        rc = slap_bv2ad( attr, &ad, &errmsg );
@@ -585,14 +585,14 @@ slap_sasl_check_authz(char *searchDN, char *assertDN, struct berval *attr, char
        rc = LDAP_INAPPROPRIATE_AUTH;
 
 COMPLETE:
-       if( vals ) bvarray_free( vals );
+       if( vals ) ber_bvarray_free( vals );
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-                  "slap_sasl_check_authz: %s check returning %s\n", attr, rc ));
+                  "slap_sasl_check_authz: %s check returning %s\n", attr->bv_val, rc ));
 #else
        Debug( LDAP_DEBUG_TRACE,
-          "<==slap_sasl_check_authz: %s check returning %d\n", attr, rc, 0);
+          "<==slap_sasl_check_authz: %s check returning %d\n", attr->bv_val, rc, 0);
 #endif
 
        return( rc );