X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackend.c;h=297ec308f981b42310a28d01602493c1054d15bb;hb=d23c55964651929e7b2b5a1730b33efee9661033;hp=d2d3f5976c4c50ca73b0cf411ca9ca9844c3a562;hpb=07d0f4e4111906556090818c7917b8188c9b79d1;p=openldap

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index d2d3f5976c..297ec308f9 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -892,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;
@@ -900,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;
@@ -1004,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,
@@ -1022,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 );
 		}