improved filter mapping/rewrite; improved result rewriting; improved attribute/object...

[openldap] / servers / slapd / back-ldap / group.c

diff --git a/servers/slapd/back-ldap/group.c b/servers/slapd/back-ldap/group.c
index aa413b66482783f45d722d6b7333534e0672e6dc..199ead103aa31add76f8c66389e677ade1ca0667 100644 (file)
--- a/servers/slapd/back-ldap/group.c
+++ b/servers/slapd/back-ldap/group.c
@@ -33,13 +33,13 @@ ldap_back_group(
 )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;    
-       int rc = 1;
+       struct ldapconn *lc;
+       int rc = 1, oc;
        Attribute   *attr;
 
        LDAPMessage     *result;
        char *gattr[2];
        char *filter = NULL, *ptr;
-       LDAP *ld;
        struct berval mop_ndn = { 0, NULL }, mgr_ndn = { 0, NULL };
 
        AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
@@ -82,7 +82,7 @@ ldap_back_group(
                         * attribute has not been required
                         */
                        if ((attr = attr_find(target->e_attrs, group_at)) != NULL) {
-                               if( value_find_ex( group_at, SLAP_MR_VALUE_NORMALIZED_MATCH,
+                               if( value_find_ex( group_at, SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
                                        attr->a_vals, op_ndn ) != LDAP_SUCCESS )
                                        return(1);
                                return(0);
@@ -156,11 +156,11 @@ ldap_back_group(
 
        ldap_back_map(&li->oc_map, &group_oc_name, &group_oc_name,
                        BACKLDAP_MAP);
-       if (group_oc_name.bv_val == NULL)
+       if (group_oc_name.bv_val == NULL || group_oc_name.bv_val[0] == '\0')
                goto cleanup;
        ldap_back_map(&li->at_map, &group_at_name, &group_at_name,
                        BACKLDAP_MAP);
-       if (group_at_name.bv_val == NULL)
+       if (group_at_name.bv_val == NULL || group_at_name.bv_val[0] == '\0')
                goto cleanup;
 
        filter = ch_malloc(sizeof("(&(objectclass=)(=))")
@@ -170,14 +170,15 @@ ldap_back_group(
        if (filter == NULL)
                goto cleanup;
 
-       if (ldap_initialize(&ld, li->url) != LDAP_SUCCESS) {
-               goto cleanup;
-       }
-
-       if (ldap_bind_s(ld, li->binddn, li->bindpw, LDAP_AUTH_SIMPLE)
-                       != LDAP_SUCCESS) {
+       /* Tell getconn this is a privileged op */
+       oc = op->o_do_not_cache;
+       op->o_do_not_cache = 1;
+       lc = ldap_back_getconn(li, conn, op);
+       if ( !lc || !ldap_back_dobind( li, lc, NULL, op ) ) {
+               op->o_do_not_cache = oc;
                goto cleanup;
        }
+       op->o_do_not_cache = oc;
 
        ptr = lutil_strcopy(filter, "(&(objectclass=");
        ptr = lutil_strcopy(ptr, group_oc_name.bv_val);
@@ -189,18 +190,15 @@ ldap_back_group(
 
        gattr[0] = "objectclass";
        gattr[1] = NULL;
-       if (ldap_search_ext_s(ld, mgr_ndn.bv_val, LDAP_SCOPE_BASE, filter,
+       if (ldap_search_ext_s(lc->ld, mgr_ndn.bv_val, LDAP_SCOPE_BASE, filter,
                gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
                LDAP_NO_LIMIT, &result) == LDAP_SUCCESS) {
-               if (ldap_first_entry(ld, result) != NULL)
+               if (ldap_first_entry(lc->ld, result) != NULL)
                        rc = 0;
                ldap_msgfree(result);
        }
 
 cleanup:;
-       if ( ld != NULL ) {
-               ldap_unbind(ld);
-       }
        ch_free(filter);
        if ( mop_ndn.bv_val != op_ndn->bv_val ) {
                free( mop_ndn.bv_val );