improve restricted exop

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index c0ca57b330ea404476f95840da43d1028b6aeaf8..6964120e98d22e82fd5836679319bab4f77f070c 100644 (file)
--- 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;