ITS#2496 use SLAP_PTRCMP for pointer comparisons

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index a5bfc4fd571e9e4b97a79dc2340413b812b3bd49..65a8cc215d55900ab8981d220dbc74f4aca905c6 100644 (file)
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -29,7 +29,7 @@ ainfo_type_cmp(
 {
        const AttributeDescription *desc = v_desc;
        const AttrInfo  *a = v_a;
-       return desc - a->ai_desc;
+       return SLAP_PTRCMP(desc, a->ai_desc);
 }
 
 static int
@@ -39,7 +39,7 @@ ainfo_cmp(
 )
 {
        const AttrInfo *a = v_a, *b = v_b;
-       return a->ai_desc - b->ai_desc;
+       return SLAP_PTRCMP(a->ai_desc, b->ai_desc);
 }
 
 void

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index bed8436d1fd0ce99939ce7456225af5d226df538..b1e8341090226584a548a353dca9fc233009e485 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -122,8 +122,10 @@ ldap_back_bind(
        }
 
        if ( li->savecred ) {
-               if ( lc->cred.bv_val )
+               if ( lc->cred.bv_val ) {
+                       memset( lc->cred.bv_val, 0, lc->cred.bv_len );
                        ch_free( lc->cred.bv_val );
+               }
                ber_dupbv( &lc->cred, cred );
                ldap_set_rebind_proc( lc->ld, ldap_back_rebind, lc );
        }
@@ -154,7 +156,7 @@ ldap_back_conn_cmp(
        const struct ldapconn *lc1 = (const struct ldapconn *)c1;
        const struct ldapconn *lc2 = (const struct ldapconn *)c2;
        
-       return ( ( lc1->conn < lc2->conn ) ? -1 : ( ( lc1->conn > lc2-> conn ) ? 1 : 0 ) );
+       return SLAP_PTRCMP(lc1->conn, lc2->conn);
 }
 
 /*

diff --git a/servers/slapd/back-ldbm/attr.c b/servers/slapd/back-ldbm/attr.c
index 15b3055e91f4eb2b0355969ae1afc7f330bbfa89..22f15d41f83449faa0ac058b1b83240f3d303fac 100644 (file)
--- a/servers/slapd/back-ldbm/attr.c
+++ b/servers/slapd/back-ldbm/attr.c
@@ -29,7 +29,7 @@ ainfo_type_cmp(
 {
        const AttributeDescription *desc = v_desc;
        const AttrInfo             *a    = v_a;
-       return desc - a->ai_desc;
+       return SLAP_PTRCMP(desc, a->ai_desc);
 }
 
 static int
@@ -39,7 +39,7 @@ ainfo_cmp(
 )
 {
        const AttrInfo *a = v_a, *b = v_b;
-       return a->ai_desc - b->ai_desc;
+       return SLAP_PTRCMP(a->ai_desc, b->ai_desc);
 }
 
 void

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 8289819a88ec55313a208228b866e94aa91aa91e..82e02401b84449b76891cae8b81d4403e2397e65 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -97,8 +97,7 @@ meta_back_conn_cmp(
        struct metaconn *lc1 = ( struct metaconn * )c1;
         struct metaconn *lc2 = ( struct metaconn * )c2;
        
-       return ( ( lc1->conn < lc2->conn ) ? -1 :
-                       ( ( lc1->conn > lc2-> conn ) ? 1 : 0 ) );
+       return SLAP_PTRCMP( lc1->conn, lc2->conn );
 }
 
 /*

diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c
index 6244955033b07ae2c8fff893139481c4c54277c2..897535bc964f3fdc21c961d0df3d6705b18b4811 100644 (file)
--- a/servers/slapd/back-sql/schema-map.c
+++ b/servers/slapd/back-sql/schema-map.c
@@ -29,7 +29,7 @@ static int
 backsql_cmp_oc( const void *v_m1, const void *v_m2 )
 {
        const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2;
-       return ( m1->oc < m2->oc ? -1 : ( m1->oc > m2->oc ? 1 : 0 ) );
+       return SLAP_PTRCMP( m1->oc, m2->oc );
 }
 
 static int
@@ -46,7 +46,7 @@ static int
 backsql_cmp_attr( const void *v_m1, const void *v_m2 )
 {
        const backsql_at_map_rec *m1 = v_m1, *m2 = v_m2;
-       return ( m1->ad < m2->ad ? -1 : ( m1->ad > m2->ad ? 1 : 0 ) );
+       return SLAP_PTRCMP( m1->ad, m2->ad );
 }
 
 static int

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index efff35b379d05110081a83b2bc284c699e322393..fdd5a18444cdd2109feb21d8966f3362be486a0b 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -385,7 +385,7 @@ entry_free( Entry *e )
 int
 entry_cmp( Entry *e1, Entry *e2 )
 {
-       return( e1 < e2 ? -1 : (e1 > e2 ? 1 : 0) );
+       return SLAP_PTRCMP( e1, e2 );
 }
 
 int
@@ -393,9 +393,8 @@ entry_dn_cmp( const void *v_e1, const void *v_e2 )
 {
        /* compare their normalized UPPERCASED dn's */
        const Entry *e1 = v_e1, *e2 = v_e2;
-       int rc = e1->e_nname.bv_len - e2->e_nname.bv_len;
-       if (rc) return rc;
-       return( strcmp( e1->e_ndn, e2->e_ndn ) );
+
+       return ber_bvcmp( &e1->e_nname, &e2->e_nname );
 }
 
 int

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 94afcff34b3af914d68ae2a936ee3451e4ed3e07..b9d9667fd21cd04f77c70ae37e821c69a2794205 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1081,6 +1081,9 @@ LDAP_SLAPD_F (int) value_add_one LDAP_P((
        BerVarray *vals,
        struct berval *addval ));
 
+/* assumes (x) > (y) returns 1 if true, 0 otherwise */
+#define SLAP_PTRCMP(x, y) ((x) < (y) ? -1 : (x) > (y))
+
 /*
  * Other...
  */