X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fdn.c;h=cb4c6951655718bf4b97b278512bea16fa2ec61b;hb=d9edc7d5afd2860fac2fa0121044db28d94c9f7f;hp=74bd594e7602634d68bad0ee7440a0307e9e18d6;hpb=0109f871bf9399a1542627fe64cb724c9812e3a4;p=openldap diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c index 74bd594e76..cb4c695165 100644 --- a/servers/slapd/dn.c +++ b/servers/slapd/dn.c @@ -703,11 +703,10 @@ dnPrettyNormal( struct berval *normal, void *ctx) { - Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 ); - assert( val != NULL ); assert( pretty != NULL ); assert( normal != NULL ); + Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 ); if ( val->bv_len == 0 ) { ber_dupbv_x( pretty, val, ctx ); @@ -1169,11 +1168,13 @@ dnIsSuffix( const struct berval *dn, const struct berval *suffix ) { - int d = dn->bv_len - suffix->bv_len; + int d; assert( dn != NULL ); assert( suffix != NULL ); + d = dn->bv_len - suffix->bv_len; + /* empty suffix matches any dn */ if ( suffix->bv_len == 0 ) { return 1;