ITS#5264

diff --git a/CHANGES b/CHANGES
index 34c50b9474eb16a301417c2fb93b01269508db65..26f9b590c81465204446a50748711794a77b4beb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.4.8 Engineering
        Fixed slapd include handling (ITS#5276)
        Fixed slapd non-atomic signal variables (ITS#5248)
        Fixed slapd overlay ordering when moving to slapd.d (ITS#5284)
+       Fixed slapd NULL printf (ITS#5264)
        Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)
        Fixed slapd-ldif delete (ITS#5265)
        Added slapo-autogroup contrib module (ITS#5145)

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 135c242fe53a4bf33dfeabf7bd9ad116da99c2ad..e5c508fa33e336e4a3ac9e007b133297915acd32 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -1665,7 +1665,7 @@ slap_sasl_match( Operation *opx, struct berval *rule,
 
        Debug( LDAP_DEBUG_TRACE,
           "===>slap_sasl_match: comparing DN %s to rule %s\n",
-               assertDN->bv_val, rule->bv_val, 0 );
+               assertDN->bv_len ? assertDN->bv_val : "(null)", rule->bv_val, 0 );
 
        /* NOTE: don't normalize rule if authz syntax is enabled */
        rc = slap_parseURI( opx, rule, &base, &op.o_req_ndn,
@@ -2038,11 +2038,16 @@ int slap_sasl_authorized( Operation *op,
        int rc = LDAP_INAPPROPRIATE_AUTH;
 
        /* User binding as anonymous */
-       if ( authzDN == NULL ) {
+       if ( !authzDN || !authzDN->bv_len || !authzDN->bv_val ) {
                rc = LDAP_SUCCESS;
                goto DONE;
        }
 
+       /* User is anonymous */
+       if ( !authcDN || !authcDN->bv_len || !authcDN->bv_val ) {
+               goto DONE;
+       }
+
        Debug( LDAP_DEBUG_TRACE,
           "==>slap_sasl_authorized: can %s become %s?\n",
                authcDN->bv_len ? authcDN->bv_val : "(null)",