From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 1 May 2004 18:55:23 +0000 (+0000)
Subject: improve restricted exop
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~409
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=25a054a48731fd0bc6d808624ce8682c085f7f45;p=openldap

improve restricted exop
---

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index c0ca57b330..6964120e98 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1356,8 +1356,6 @@ read_config( const char *fname, int depth )
 							STRLENOF( "extended" ) ) == 0 ) {
 					char	*e = cargv[ i ] + STRLENOF( "extended" );
 
-					restrict |= SLAP_RESTRICT_OP_EXTENDED;
-
 					if ( e[0] == '=' ) {
 						int	j;
 
@@ -1373,8 +1371,11 @@ read_config( const char *fname, int depth )
 							goto restrict_unknown;
 						}
 
+						restrict &= ~SLAP_RESTRICT_OP_EXTENDED;
+
 					} else if ( e[0] == '\0' ) {
-						restrict = SLAP_RESTRICT_EXOP_MASK;
+						restrict &= ~SLAP_RESTRICT_EXOP_MASK;
+						restrict |= SLAP_RESTRICT_OP_EXTENDED;
 						
 					} else {
 						goto restrict_unknown;