Don't use 'shtool mkln' as ln(1) replacement.

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 64c42e9a440e611190625335290a098c6118657e..297ec308f981b42310a28d01602493c1054d15bb 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -579,14 +579,13 @@ select_backend(
 int
 be_issuffix(
     Backend    *be,
-    const char *suffix
+    struct berval      *bvsuffix
 )
 {
        int     i;
-       struct berval   bvsuffix = { strlen( suffix ), (char *)suffix };
 
        for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i] != NULL; i++ ) {
-               if ( ber_bvcmp( be->be_nsuffix[i], &bvsuffix ) == 0 ) {
+               if ( ber_bvcmp( be->be_nsuffix[i], bvsuffix ) == 0 ) {
                        return( 1 );
                }
        }
@@ -893,7 +892,7 @@ backend_check_restrictions(
 
                if( requires & SLAP_REQUIRE_STRONG ) {
                        /* should check mechanism */
-                       if( op->o_authmech == NULL || op->o_dn.bv_len == 0 )
+                       if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 )
                        {
                                *text = "strong authentication required";
                                return LDAP_STRONG_AUTH_REQUIRED;
@@ -901,7 +900,7 @@ backend_check_restrictions(
                }
 
                if( requires & SLAP_REQUIRE_SASL ) {
-                       if( op->o_authmech == NULL || op->o_dn.bv_len == 0 )
+                       if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 )
                        {
                                *text = "SASL authentication required";
                                return LDAP_STRONG_AUTH_REQUIRED;
@@ -1005,16 +1004,17 @@ backend_group(
        } 
 
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-       for (g = conn->c_groups; g; g=g->next) {
-               if (g->be != be || g->oc != group_oc || g->at != group_at ||
-                   g->len != gr_ndn->bv_len)
+       for (g = conn->c_groups; g; g=g->ga_next) {
+               if (g->ga_be != be || g->ga_oc != group_oc ||
+                       g->ga_at != group_at || g->ga_len != gr_ndn->bv_len)
                        continue;
-               if (strcmp( g->ndn, gr_ndn->bv_val ) == 0)
+               if (strcmp( g->ga_ndn, gr_ndn->bv_val ) == 0)
                        break;
        }
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-       if (g)
-               return g->res;
+       if (g) {
+               return g->ga_res;
+       }
 
        if( be->be_group ) {
                int res = be->be_group( be, conn, op,
@@ -1023,14 +1023,14 @@ backend_group(
                
                if (op->o_tag != LDAP_REQ_BIND) {
                        g = ch_malloc(sizeof(GroupAssertion) + gr_ndn->bv_len);
-                       g->be = be;
-                       g->oc = group_oc;
-                       g->at = group_at;
-                       g->res = res;
-                       g->len = gr_ndn->bv_len;
-                       strcpy(g->ndn, gr_ndn->bv_val);
+                       g->ga_be = be;
+                       g->ga_oc = group_oc;
+                       g->ga_at = group_at;
+                       g->ga_res = res;
+                       g->ga_len = gr_ndn->bv_len;
+                       strcpy(g->ga_ndn, gr_ndn->bv_val);
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-                       g->next = conn->c_groups;
+                       g->ga_next = conn->c_groups;
                        conn->c_groups = g;
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                }