ldap/servers/slapd/libglobs.c | 23 +++++++++--------------
ldap/servers/slapd/slap.h | 4 +++-
2 files changed, 12 insertions(+), 15 deletions(-)
New commits:
commit d8b273f32fb2b19de0b72420e9a1a5e2a360448b
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu May 9 16:55:52 2013 -0400
Revert "Ticket 511 - Revision - allow turning off vattr lookup in search entry
return"
This feature was not added to 1.3.0, so this commit should not have been cherry
picked
This reverts commit b97ce864578e3a98ea028a5d7236dc26c9be0b09.
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 98cf730..537b98a 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1012,16 +1012,6 @@ static struct config_get_and_set {
NULL, 0,
(void**)&global_slapdFrontendConfig.allowed_sasl_mechs,
CONFIG_STRING, (ConfigGetFunc)config_get_allowed_sasl_mechs,
DEFAULT_ALLOWED_TO_DELETE_ATTRS},
- {CONFIG_IGNORE_VATTRS, config_set_ignore_vattrs,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ignore_vattrs,
- CONFIG_ON_OFF, (ConfigGetFunc)config_get_ignore_vattrs,
DEFAULT_ALLOWED_TO_DELETE_ATTRS},
- {CONFIG_UNHASHED_PW_SWITCH_ATTRIBUTE, config_set_unhashed_pw_switch,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.unhashed_pw_switch,
- CONFIG_SPECIAL_UNHASHED_PW_SWITCH,
- (ConfigGetFunc)config_get_unhashed_pw_switch,
- DEFAULT_UNHASHED_PW_SWITCH},
{CONFIG_SASL_MAXBUFSIZE, config_set_sasl_maxbufsize,
NULL, 0,
(void**)&global_slapdFrontendConfig.sasl_max_bufsize,
@@ -1454,7 +1444,6 @@ FrontendConfig_init () {
init_ndn_cache_enabled = cfg->ndn_cache_enabled = LDAP_OFF;
cfg->ndn_cache_max_size = NDN_DEFAULT_SIZE;
init_sasl_mapping_fallback = cfg->sasl_mapping_fallback = LDAP_OFF;
- cfg->ignore_vattrs = LDAP_OFF;
cfg->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
#ifdef MEMPOOL_EXPERIMENTAL
@@ -1586,9 +1575,12 @@ config_set_ignore_vattrs (const char *attrname, char *value, char
*errorbuf, int
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
int retVal = LDAP_SUCCESS;
+ int val;
- retVal = config_set_onoff ( attrname, value,
&(slapdFrontendConfig->ignore_vattrs), errorbuf, apply);
-
+ retVal = config_set_onoff ( attrname, value, &val, errorbuf, apply);
+ if(retVal == LDAP_SUCCESS){
+ slapi_counter_set_value(slapdFrontendConfig->ignore_vattrs, val);
+ }
return retVal;
}
@@ -4206,11 +4198,13 @@ config_get_sasl_maxbufsize()
}
int
+<<<<<<< HEAD
+=======
config_get_ignore_vattrs()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- return (int)slapdFrontendConfig->ignore_vattrs;
+ return slapi_counter_get_value(slapdFrontendConfig->ignore_vattrs);
}
int
@@ -4227,6 +4221,7 @@ config_get_sasl_mapping_fallback()
}
int
+>>>>>>> 655bd4d... Ticket 47355 - dse.ldif doesn't replicate
update to nsslapd-sasl-mapping-fallback
config_get_disk_monitoring(){
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
int retVal;
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 857a36a..c46f415 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2280,8 +2280,10 @@ typedef struct _slapdFrontendConfig {
size_t ndn_cache_max_size;
slapi_onoff_t return_orig_type; /* if on, search returns original type set in attr list
*/
+
+ /* atomic settings */
+ Slapi_Counter *ignore_vattrs;
slapi_onoff_t sasl_mapping_fallback;
- slapi_onoff_t ignore_vattrs;
slapi_onoff_t unhashed_pw_switch; /* switch to on/off/nolog unhashed pw */
slapi_onoff_t enable_turbo_mode;
} slapdFrontendConfig_t;