From 9035965b093e8ef0a4bdb42f275ffd6d658398c7 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 8 Jan 2006 20:16:58 +0000
Subject: [PATCH] Additional SLAPI updates from HEAD
---
servers/slapd/slapi/slapi_overlay.c | 2 +-
servers/slapd/slapi/slapi_utils.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index f0939886e9..1ffe35af6d 100644
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -479,7 +479,7 @@ slapi_over_unmerge_controls( Operation *op, SlapReply *rs )
slapi_pblock_get( pb, SLAPI_X_OLD_RESCONTROLS, (void **)&rs_ctrls );
- if ( rs->sr_ctrls == NULL || rs->sr_ctrls == rs_ctrls ) {
+ if ( rs_ctrls == NULL || rs->sr_ctrls == rs_ctrls ) {
/* no copying done */
return LDAP_SUCCESS;
}
diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index ef216736b8..f60cc9d18e 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -2717,7 +2717,6 @@ LDAPMod **slapi_int_modifications2ldapmods( Modifications *modlist )
modp->mod_type = slapi_ch_strdup( ml->sml_desc->ad_cname.bv_val );
} else {
modp->mod_type = slapi_ch_strdup( ml->sml_type.bv_val );
- BER_BVZERO( &ml->sml_type );
}
if ( ml->sml_values != NULL ) {
@@ -3100,7 +3099,7 @@ int slapi_int_access_allowed( Operation *op,
break;
}
- rc = slapi_int_get_plugins( op->o_bd, SLAPI_PLUGIN_ACL_ALLOW_ACCESS, (SLAPI_FUNC **)&tmpPlugin );
+ rc = slapi_int_get_plugins( frontendDB, SLAPI_PLUGIN_ACL_ALLOW_ACCESS, (SLAPI_FUNC **)&tmpPlugin );
if ( rc != LDAP_SUCCESS || tmpPlugin == NULL ) {
/* nothing to do; allowed access */
return 1;
--
GitLab