ldap/servers
by Ludwig Krispenz
ldap/servers/slapd/entry.c | 2 +-
ldap/servers/slapd/entrywsi.c | 3 ---
ldap/servers/slapd/valueset.c | 4 ++--
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 215741d21ce1ad89809ad4e7aa6cb972dde28116
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Fri May 10 13:25:20 2013 +0200
Fix compiler warnings introduced by fix for #569
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 6ca4c72..06815fb 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -1725,7 +1725,7 @@ entry2str_internal_put_attrlist( const Slapi_Attr *attrlist, int attr_state, int
* never be seen by any client. It will never be moved to the
* present values and is only used to preserve the AD-csn
*/
- valueset_add_string (&a->a_deleted_values, "", CSN_TYPE_VALUE_DELETED, a->a_deletioncsn);
+ valueset_add_string ((Slapi_ValueSet *)&a->a_deleted_values, "", CSN_TYPE_VALUE_DELETED, a->a_deletioncsn);
}
entry2str_internal_put_valueset(a->a_type, a->a_deletioncsn, CSN_TYPE_ATTRIBUTE_DELETED, attr_state, &a->a_deleted_values, VALUE_DELETED, ecur, typebuf, typebuf_len, entry2str_ctrl);
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
index c786b87..af96039 100644
--- a/ldap/servers/slapd/entrywsi.c
+++ b/ldap/servers/slapd/entrywsi.c
@@ -46,8 +46,6 @@
#include "slap.h"
#include "slapi-plugin.h"
-static void resolve_attribute_state(Slapi_Entry *e, Slapi_Attr *a, int attribute_state, int delete_priority);
-
static int
entry_present_value_to_deleted_value(Slapi_Attr *a, Slapi_Value *v)
{
@@ -776,7 +774,6 @@ entry_delete_present_values_wsi_multi_valued(Slapi_Entry *e, const char *type, s
{
int retVal= LDAP_SUCCESS;
Slapi_Attr *a= NULL;
- int attr_state= entry_attr_find_wsi(e, type, &a);
/* The attribute is on the present list, or the deleted list and we're doing URP */
if ( vals == NULL || vals[0] == NULL )
{
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
index c041714..afde14b 100644
--- a/ldap/servers/slapd/valueset.c
+++ b/ldap/servers/slapd/valueset.c
@@ -1456,7 +1456,7 @@ valueset_update_csn_for_valuearray_ext(Slapi_ValueSet *vs, const Slapi_Attr *a,
{
value_update_csn(vs->va[index],t,csn);
if (csnref_updated)
- valuestoupdate[i]->v_csnset = value_get_csnset(vs->va[index]);
+ valuestoupdate[i]->v_csnset = (CSNSet *)value_get_csnset(vs->va[index]);
valuearrayfast_add_value_passin(&vaf_valuesupdated,valuestoupdate[i]);
valuestoupdate[i] = NULL;
}
@@ -1473,7 +1473,7 @@ valueset_update_csn_for_valuearray_ext(Slapi_ValueSet *vs, const Slapi_Attr *a,
{
value_update_csn(vs->va[index],t,csn);
if (csnref_updated)
- valuestoupdate[i]->v_csnset = value_get_csnset(vs->va[index]);
+ valuestoupdate[i]->v_csnset = (CSNSet *)value_get_csnset(vs->va[index]);
valuearrayfast_add_value_passin(&vaf_valuesupdated,valuestoupdate[i]);
valuestoupdate[i]= NULL;
}
10 years, 10 months
Branch '389-ds-base-1.3.0' - ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 50 ------------------------------------------
ldap/servers/slapd/slap.h | 8 ------
2 files changed, 58 deletions(-)
New commits:
commit ce102a9381e63b5d2a83f0abcee22ca008a84e0a
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu May 9 16:58:18 2013 -0400
Revert "Ticket 47355 - dse.ldif doesn't replicate update to nsslapd-sasl-mapping-fallback"
This feature was not included in 1.3.0, and should not have been cherry picked.
This reverts commit 3148cf2957fa7774e0539c63e9fd9d3bf682a03c.
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 537b98a..a5c1067 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1443,7 +1443,6 @@ FrontendConfig_init () {
init_disk_logging_critical = cfg->disk_logging_critical = LDAP_OFF;
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->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
#ifdef MEMPOOL_EXPERIMENTAL
@@ -1571,31 +1570,6 @@ config_value_is_null( const char *attrname, const char *value, char *errorbuf,
}
int
-config_set_ignore_vattrs (const char *attrname, char *value, char *errorbuf, int apply )
-{
- slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- int retVal = LDAP_SUCCESS;
- int val;
-
- retVal = config_set_onoff ( attrname, value, &val, errorbuf, apply);
- if(retVal == LDAP_SUCCESS){
- slapi_counter_set_value(slapdFrontendConfig->ignore_vattrs, val);
- }
- return retVal;
-}
-
-int
-config_set_sasl_mapping_fallback (const char *attrname, char *value, char *errorbuf, int apply )
-{
- slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- int retVal = LDAP_SUCCESS;
-
- retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->sasl_mapping_fallback), errorbuf, apply);
-
- return retVal;
-}
-
-int
config_set_disk_monitoring( const char *attrname, char *value, char *errorbuf, int apply )
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -4198,30 +4172,6 @@ config_get_sasl_maxbufsize()
}
int
-<<<<<<< HEAD
-=======
-config_get_ignore_vattrs()
-{
- slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
-
- return slapi_counter_get_value(slapdFrontendConfig->ignore_vattrs);
-}
-
-int
-config_get_sasl_mapping_fallback()
-{
- slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- int retVal;
-
- CFG_ONOFF_LOCK_READ(slapdFrontendConfig);
- retVal = (int)slapdFrontendConfig->sasl_mapping_fallback;
- CFG_ONOFF_UNLOCK_READ(slapdFrontendConfig);
-
- return retVal;
-}
-
-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 c46f415..43a213e 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2278,14 +2278,6 @@ typedef struct _slapdFrontendConfig {
/* normalized dn cache */
int ndn_cache_enabled;
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 unhashed_pw_switch; /* switch to on/off/nolog unhashed pw */
- slapi_onoff_t enable_turbo_mode;
} slapdFrontendConfig_t;
/* possible values for slapdFrontendConfig_t.schemareplace */
10 years, 10 months
Branch '389-ds-base-1.3.0' - ldap/servers
by Mark Reynolds
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;
10 years, 10 months
Branch '389-ds-base-1.3.0' - ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 23 ++++++++++++++---------
ldap/servers/slapd/slap.h | 4 +---
2 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit b97ce864578e3a98ea028a5d7236dc26c9be0b09
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 17:07:55 2013 -0400
Ticket 511 - Revision - allow turning off vattr lookup in search entry return
Bug Description: A Slapi_Counter was being used to store the config setting. This
is no longer necessary, and it can cause issues with config value
state.
https://fedorahosted.org/389/ticket/511
Reviewed by: richm(Thanks!)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 537b98a..98cf730 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1012,6 +1012,16 @@ 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,
@@ -1444,6 +1454,7 @@ 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
@@ -1575,12 +1586,9 @@ 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, &val, errorbuf, apply);
- if(retVal == LDAP_SUCCESS){
- slapi_counter_set_value(slapdFrontendConfig->ignore_vattrs, val);
- }
+ retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->ignore_vattrs), errorbuf, apply);
+
return retVal;
}
@@ -4198,13 +4206,11 @@ config_get_sasl_maxbufsize()
}
int
-<<<<<<< HEAD
-=======
config_get_ignore_vattrs()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- return slapi_counter_get_value(slapdFrontendConfig->ignore_vattrs);
+ return (int)slapdFrontendConfig->ignore_vattrs;
}
int
@@ -4221,7 +4227,6 @@ 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 c46f415..857a36a 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2280,10 +2280,8 @@ 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;
10 years, 10 months
Branch '389-ds-base-1.3.0' - ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 50 ++++++++++++++++++++++++++++++++++++++++++
ldap/servers/slapd/slap.h | 8 ++++++
2 files changed, 58 insertions(+)
New commits:
commit 3148cf2957fa7774e0539c63e9fd9d3bf682a03c
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 16:52:41 2013 -0400
Ticket 47355 - dse.ldif doesn't replicate update to nsslapd-sasl-mapping-fallback
Bug Description: Setting the feature on and off through ldapmodify can leave the dse.ldif
in an inconsistent state.
Fix Description: Using a Slapi_Counter is not necessary, and it caused issues. Set the config
type back to integer.
https://fedorahosted.org/389/ticket/47355
reviewed by: richm(Thanks!)
(cherry picked from commit ba0d57922339a1f114db236da28112280f2ec9c1)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index a5c1067..537b98a 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1443,6 +1443,7 @@ FrontendConfig_init () {
init_disk_logging_critical = cfg->disk_logging_critical = LDAP_OFF;
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->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
#ifdef MEMPOOL_EXPERIMENTAL
@@ -1570,6 +1571,31 @@ config_value_is_null( const char *attrname, const char *value, char *errorbuf,
}
int
+config_set_ignore_vattrs (const char *attrname, char *value, char *errorbuf, int apply )
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ int retVal = LDAP_SUCCESS;
+ int val;
+
+ retVal = config_set_onoff ( attrname, value, &val, errorbuf, apply);
+ if(retVal == LDAP_SUCCESS){
+ slapi_counter_set_value(slapdFrontendConfig->ignore_vattrs, val);
+ }
+ return retVal;
+}
+
+int
+config_set_sasl_mapping_fallback (const char *attrname, char *value, char *errorbuf, int apply )
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ int retVal = LDAP_SUCCESS;
+
+ retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->sasl_mapping_fallback), errorbuf, apply);
+
+ return retVal;
+}
+
+int
config_set_disk_monitoring( const char *attrname, char *value, char *errorbuf, int apply )
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -4172,6 +4198,30 @@ config_get_sasl_maxbufsize()
}
int
+<<<<<<< HEAD
+=======
+config_get_ignore_vattrs()
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ return slapi_counter_get_value(slapdFrontendConfig->ignore_vattrs);
+}
+
+int
+config_get_sasl_mapping_fallback()
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ int retVal;
+
+ CFG_ONOFF_LOCK_READ(slapdFrontendConfig);
+ retVal = (int)slapdFrontendConfig->sasl_mapping_fallback;
+ CFG_ONOFF_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
+}
+
+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 43a213e..c46f415 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2278,6 +2278,14 @@ typedef struct _slapdFrontendConfig {
/* normalized dn cache */
int ndn_cache_enabled;
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 unhashed_pw_switch; /* switch to on/off/nolog unhashed pw */
+ slapi_onoff_t enable_turbo_mode;
} slapdFrontendConfig_t;
/* possible values for slapdFrontendConfig_t.schemareplace */
10 years, 10 months
Branch '389-ds-base-1.3.1' - ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 13 +++++--------
ldap/servers/slapd/slap.h | 4 +---
2 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 3da40b4ca307c38a984816627c665654df62b309
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 17:07:55 2013 -0400
Ticket 511 - Revision - allow turning off vattr lookup in search entry return
Bug Description: A Slapi_Counter was being used to store the config setting. This
is no longer necessary, and it can cause issues with config value
state.
https://fedorahosted.org/389/ticket/511
Reviewed by: richm(Thanks!)
(cherry picked from commit b3d2ee00d4874e8b5dc28df77871c63fdd24dc85)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index fc87e86..8b234f6 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1029,7 +1029,7 @@ static struct config_get_and_set {
{CONFIG_IGNORE_VATTRS, config_set_ignore_vattrs,
NULL, 0,
(void**)&global_slapdFrontendConfig.ignore_vattrs,
- CONFIG_STRING, (ConfigGetFunc)config_get_ignore_vattrs, DEFAULT_ALLOWED_TO_DELETE_ATTRS},
+ 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,
@@ -1482,8 +1482,8 @@ FrontendConfig_init () {
init_disk_logging_critical = cfg->disk_logging_critical = LDAP_OFF;
init_ndn_cache_enabled = cfg->ndn_cache_enabled = LDAP_OFF;
cfg->ndn_cache_max_size = NDN_DEFAULT_SIZE;
- cfg->ignore_vattrs = slapi_counter_new();
init_sasl_mapping_fallback = cfg->sasl_mapping_fallback = LDAP_OFF;
+ cfg->ignore_vattrs = LDAP_OFF;
cfg->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
cfg->unhashed_pw_switch = SLAPD_UNHASHED_PW_ON;
init_return_orig_type = cfg->return_orig_type = LDAP_OFF;
@@ -1618,12 +1618,9 @@ 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, &val, errorbuf, apply);
- if(retVal == LDAP_SUCCESS){
- slapi_counter_set_value(slapdFrontendConfig->ignore_vattrs, val);
- }
+ retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->ignore_vattrs), errorbuf, apply);
+
return retVal;
}
@@ -4283,7 +4280,7 @@ config_get_ignore_vattrs()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- return slapi_counter_get_value(slapdFrontendConfig->ignore_vattrs);
+ return (int)slapdFrontendConfig->ignore_vattrs;
}
int
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 06eef47..a4258bb 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2315,10 +2315,8 @@ 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;
10 years, 10 months
Branch '389-ds-base-1.3.1' - ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 17 +++++++++--------
ldap/servers/slapd/slap.h | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 655bd4d8b193785d0acfb901760c70645e499cef
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 16:52:41 2013 -0400
Ticket 47355 - dse.ldif doesn't replicate update to nsslapd-sasl-mapping-fallback
Bug Description: Setting the feature on and off through ldapmodify can leave the dse.ldif
in an inconsistent state.
Fix Description: Using a Slapi_Counter is not necessary, and it caused issues. Set the config
type back to integer.
https://fedorahosted.org/389/ticket/47355
reviewed by: richm(Thanks!)
(cherry picked from commit ba0d57922339a1f114db236da28112280f2ec9c1)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 9780b2e..fc87e86 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1483,8 +1483,7 @@ FrontendConfig_init () {
init_ndn_cache_enabled = cfg->ndn_cache_enabled = LDAP_OFF;
cfg->ndn_cache_max_size = NDN_DEFAULT_SIZE;
cfg->ignore_vattrs = slapi_counter_new();
- cfg->sasl_mapping_fallback = slapi_counter_new();
- init_sasl_mapping_fallback = LDAP_OFF;
+ init_sasl_mapping_fallback = cfg->sasl_mapping_fallback = LDAP_OFF;
cfg->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
cfg->unhashed_pw_switch = SLAPD_UNHASHED_PW_ON;
init_return_orig_type = cfg->return_orig_type = LDAP_OFF;
@@ -1633,12 +1632,9 @@ config_set_sasl_mapping_fallback (const char *attrname, char *value, char *error
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
int retVal = LDAP_SUCCESS;
- int val;
- retVal = config_set_onoff ( attrname, value, &val, errorbuf, apply);
- if(retVal == LDAP_SUCCESS){
- slapi_counter_set_value(slapdFrontendConfig->sasl_mapping_fallback, val);
- }
+ retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->sasl_mapping_fallback), errorbuf, apply);
+
return retVal;
}
@@ -4294,8 +4290,13 @@ int
config_get_sasl_mapping_fallback()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ int retVal;
- return slapi_counter_get_value(slapdFrontendConfig->sasl_mapping_fallback);
+ CFG_ONOFF_LOCK_READ(slapdFrontendConfig);
+ retVal = (int)slapdFrontendConfig->sasl_mapping_fallback;
+ CFG_ONOFF_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
}
int
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 384ebfb..06eef47 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2318,7 +2318,7 @@ typedef struct _slapdFrontendConfig {
/* atomic settings */
Slapi_Counter *ignore_vattrs;
- Slapi_Counter *sasl_mapping_fallback;
+ slapi_onoff_t sasl_mapping_fallback;
slapi_onoff_t unhashed_pw_switch; /* switch to on/off/nolog unhashed pw */
slapi_onoff_t enable_turbo_mode;
} slapdFrontendConfig_t;
10 years, 10 months
ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 13 +++++--------
ldap/servers/slapd/slap.h | 4 +---
2 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit b3d2ee00d4874e8b5dc28df77871c63fdd24dc85
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 17:07:55 2013 -0400
Ticket 511 - Revision - allow turning off vattr lookup in search entry return
Bug Description: A Slapi_Counter was being used to store the config setting. This
is no longer necessary, and it can cause issues with config value
state.
https://fedorahosted.org/389/ticket/511
Reviewed by: richm(Thanks!)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index bfe11a6..cfb8856 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1036,7 +1036,7 @@ static struct config_get_and_set {
{CONFIG_IGNORE_VATTRS, config_set_ignore_vattrs,
NULL, 0,
(void**)&global_slapdFrontendConfig.ignore_vattrs,
- CONFIG_STRING, (ConfigGetFunc)config_get_ignore_vattrs, DEFAULT_ALLOWED_TO_DELETE_ATTRS},
+ 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,
@@ -1497,8 +1497,8 @@ FrontendConfig_init () {
init_disk_logging_critical = cfg->disk_logging_critical = LDAP_OFF;
init_ndn_cache_enabled = cfg->ndn_cache_enabled = LDAP_OFF;
cfg->ndn_cache_max_size = NDN_DEFAULT_SIZE;
- cfg->ignore_vattrs = slapi_counter_new();
init_sasl_mapping_fallback = cfg->sasl_mapping_fallback = LDAP_OFF;
+ cfg->ignore_vattrs = LDAP_OFF;
cfg->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
cfg->unhashed_pw_switch = SLAPD_UNHASHED_PW_ON;
init_return_orig_type = cfg->return_orig_type = LDAP_OFF;
@@ -1635,12 +1635,9 @@ 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, &val, errorbuf, apply);
- if(retVal == LDAP_SUCCESS){
- slapi_counter_set_value(slapdFrontendConfig->ignore_vattrs, val);
- }
+ retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->ignore_vattrs), errorbuf, apply);
+
return retVal;
}
@@ -4333,7 +4330,7 @@ config_get_ignore_vattrs()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- return slapi_counter_get_value(slapdFrontendConfig->ignore_vattrs);
+ return (int)slapdFrontendConfig->ignore_vattrs;
}
int
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index d58d322..1039b0a 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2328,10 +2328,8 @@ 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;
slapi_int_t connection_buffer; /* values are CONNECTION_BUFFER_* below */
10 years, 10 months
ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 17 +++++++++--------
ldap/servers/slapd/slap.h | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit ba0d57922339a1f114db236da28112280f2ec9c1
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 16:52:41 2013 -0400
Ticket 47355 - dse.ldif doesn't replicate update to nsslapd-sasl-mapping-fallback
Bug Description: Setting the feature on and off through ldapmodify can leave the dse.ldif
in an inconsistent state.
Fix Description: Using a Slapi_Counter is not necessary, and it caused issues. Set the config
type back to integer.
https://fedorahosted.org/389/ticket/47355
reviewed by: richm(Thanks!)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index eb250ed..bfe11a6 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1498,8 +1498,7 @@ FrontendConfig_init () {
init_ndn_cache_enabled = cfg->ndn_cache_enabled = LDAP_OFF;
cfg->ndn_cache_max_size = NDN_DEFAULT_SIZE;
cfg->ignore_vattrs = slapi_counter_new();
- cfg->sasl_mapping_fallback = slapi_counter_new();
- init_sasl_mapping_fallback = LDAP_OFF;
+ init_sasl_mapping_fallback = cfg->sasl_mapping_fallback = LDAP_OFF;
cfg->sasl_max_bufsize = SLAPD_DEFAULT_SASL_MAXBUFSIZE;
cfg->unhashed_pw_switch = SLAPD_UNHASHED_PW_ON;
init_return_orig_type = cfg->return_orig_type = LDAP_OFF;
@@ -1650,12 +1649,9 @@ config_set_sasl_mapping_fallback (const char *attrname, char *value, char *error
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
int retVal = LDAP_SUCCESS;
- int val;
- retVal = config_set_onoff ( attrname, value, &val, errorbuf, apply);
- if(retVal == LDAP_SUCCESS){
- slapi_counter_set_value(slapdFrontendConfig->sasl_mapping_fallback, val);
- }
+ retVal = config_set_onoff ( attrname, value, &(slapdFrontendConfig->sasl_mapping_fallback), errorbuf, apply);
+
return retVal;
}
@@ -4344,8 +4340,13 @@ int
config_get_sasl_mapping_fallback()
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ int retVal;
- return slapi_counter_get_value(slapdFrontendConfig->sasl_mapping_fallback);
+ CFG_ONOFF_LOCK_READ(slapdFrontendConfig);
+ retVal = (int)slapdFrontendConfig->sasl_mapping_fallback;
+ CFG_ONOFF_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
}
int
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index b84dd15..d58d322 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2331,7 +2331,7 @@ typedef struct _slapdFrontendConfig {
/* atomic settings */
Slapi_Counter *ignore_vattrs;
- Slapi_Counter *sasl_mapping_fallback;
+ slapi_onoff_t sasl_mapping_fallback;
slapi_onoff_t unhashed_pw_switch; /* switch to on/off/nolog unhashed pw */
slapi_onoff_t enable_turbo_mode;
slapi_int_t connection_buffer; /* values are CONNECTION_BUFFER_* below */
10 years, 10 months
ldap/servers
by Mark Reynolds
ldap/servers/slapd/libglobs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2473fcb14e50c4d1f498675b04d729baa24ccc9d
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 7 16:10:47 2013 -0400
Ticket 47317 - should set LDAP_OPT_X_SASL_NOCANON to LDAP_OPT_ON by default - revision
Description: typo in configuration initialization
https://fedorahosted.org/389/ticket/47317
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 675c08c..eb250ed 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1505,7 +1505,7 @@ FrontendConfig_init () {
init_return_orig_type = cfg->return_orig_type = LDAP_OFF;
init_enable_turbo_mode = cfg->enable_turbo_mode = LDAP_ON;
init_connection_buffer = cfg->connection_buffer = CONNECTION_BUFFER_ON;
- init_connection_nocanon = cfg->connection_nocanon - LDAP_ON;
+ init_connection_nocanon = cfg->connection_nocanon = LDAP_ON;
#ifdef MEMPOOL_EXPERIMENTAL
init_mempool_switch = cfg->mempool_switch = LDAP_ON;
10 years, 10 months