Commit ba33a35b authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6109

parent 133574cf
...@@ -13,6 +13,7 @@ OpenLDAP 2.4.17 Engineering ...@@ -13,6 +13,7 @@ OpenLDAP 2.4.17 Engineering
Fixed slapd moduleload with static backends and modules (ITS#6016) Fixed slapd moduleload with static backends and modules (ITS#6016)
Fixed slapd normalization of updated schema attributes (ITS#5540) Fixed slapd normalization of updated schema attributes (ITS#5540)
Fixed slapd pagedresults stacked control with overlays (ITS#6056) Fixed slapd pagedresults stacked control with overlays (ITS#6056)
Fixed slapd readonly restrictions (ITS#6109)
Fixed slapd sending cancelled operations results (ITS#6103) Fixed slapd sending cancelled operations results (ITS#6103)
Fixed slapd sockets usage on windows (ITS#6039) Fixed slapd sockets usage on windows (ITS#6039)
Fixed slapd-hdb freeing of already freed entries (ITS#6074) Fixed slapd-hdb freeing of already freed entries (ITS#6074)
......
...@@ -1296,7 +1296,8 @@ backend_check_restrictions( ...@@ -1296,7 +1296,8 @@ backend_check_restrictions(
} }
if( ( restrictops & opflag ) if( ( restrictops & opflag )
|| ( exopflag && ( restrictops & exopflag ) ) ) { || ( exopflag && ( restrictops & exopflag ) )
|| (( restrictops & SLAP_RESTRICT_READONLY ) && updateop )) {
if( ( restrictops & SLAP_RESTRICT_OP_MASK) == SLAP_RESTRICT_OP_READS ) { if( ( restrictops & SLAP_RESTRICT_OP_MASK) == SLAP_RESTRICT_OP_READS ) {
rs->sr_text = "read operations restricted"; rs->sr_text = "read operations restricted";
} else if ( restrictops & exopflag ) { } else if ( restrictops & exopflag ) {
......
...@@ -893,8 +893,7 @@ config_generic(ConfigArgs *c) { ...@@ -893,8 +893,7 @@ config_generic(ConfigArgs *c) {
if ( !c->rvalue_vals ) rc = 1; if ( !c->rvalue_vals ) rc = 1;
break; break;
case CFG_RO: case CFG_RO:
c->value_int = (c->be->be_restrictops & SLAP_RESTRICT_OP_WRITES) == c->value_int = (c->be->be_restrictops & SLAP_RESTRICT_READONLY);
SLAP_RESTRICT_OP_WRITES;
break; break;
case CFG_AZPOLICY: case CFG_AZPOLICY:
c->value_string = ch_strdup( slap_sasl_getpolicy()); c->value_string = ch_strdup( slap_sasl_getpolicy());
...@@ -1466,9 +1465,9 @@ config_generic(ConfigArgs *c) { ...@@ -1466,9 +1465,9 @@ config_generic(ConfigArgs *c) {
case CFG_RO: case CFG_RO:
if(c->value_int) if(c->value_int)
c->be->be_restrictops |= SLAP_RESTRICT_OP_WRITES; c->be->be_restrictops |= SLAP_RESTRICT_READONLY;
else else
c->be->be_restrictops &= ~SLAP_RESTRICT_OP_WRITES; c->be->be_restrictops &= ~SLAP_RESTRICT_READONLY;
break; break;
case CFG_AZPOLICY: case CFG_AZPOLICY:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment