upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7083 fix verb_to_mask usage

Browse source
This commit is contained in:
Howard Chu 2011-11-07 16:41:35 -08:00
parent a4df185adf
commit 323e70ba13
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/slapd-modules/smbk5pwd/smbk5pwd.c
View file

@ -817,10 +817,10 @@ smbk5pwd_cf_func( ConfigArgs *c )
pi->mode = 0; pi->mode = 0;
} else { } else {
slap_mask_t m; int i;
m = verb_to_mask( c->line, smbk5pwd_modules ); i = verb_to_mask( c->line, smbk5pwd_modules );
pi->mode &= ~m; pi->mode &= ~smbk5pwd_modules[i].mask;
} }
break; break;

20
servers/slapd/bconfig.c
View file

@ -3201,8 +3201,8 @@ config_restrict(ConfigArgs *c) {
if ( !c->line ) { if ( !c->line ) {
c->be->be_restrictops = 0; c->be->be_restrictops = 0;
} else { } else {
restrictops = verb_to_mask( c->line, restrictable_ops ); i = verb_to_mask( c->line, restrictable_ops );
c->be->be_restrictops ^= restrictops; c->be->be_restrictops &= ~restrictable_ops[i].mask;
} }
return 0; return 0;
} }
@ -3237,8 +3237,8 @@ config_allows(ConfigArgs *c) {
if ( !c->line ) { if ( !c->line ) {
global_allows = 0; global_allows = 0;
} else { } else {
allows = verb_to_mask( c->line, allowable_ops ); i = verb_to_mask( c->line, allowable_ops );
global_allows ^= allows; global_allows &= ~allowable_ops[i].mask;
} }
return 0; return 0;
} }
@ -3272,8 +3272,8 @@ config_disallows(ConfigArgs *c) {
if ( !c->line ) { if ( !c->line ) {
global_disallows = 0; global_disallows = 0;
} else { } else {
disallows = verb_to_mask( c->line, disallowable_ops ); i = verb_to_mask( c->line, disallowable_ops );
global_disallows ^= disallows; global_disallows &= ~disallowable_ops[i].mask;
} }
return 0; return 0;
} }
@ -3308,8 +3308,8 @@ config_requires(ConfigArgs *c) {
if ( !c->line ) { if ( !c->line ) {
c->be->be_requires = 0; c->be->be_requires = 0;
} else { } else {
requires = verb_to_mask( c->line, requires_ops ); i = verb_to_mask( c->line, requires_ops );
c->be->be_requires ^= requires; c->be->be_requires &= ~requires_ops[i].mask;
} }
return 0; return 0;
} }
@ -3579,8 +3579,8 @@ config_loglevel(ConfigArgs *c) {
if ( !c->line ) { if ( !c->line ) {
config_syslog = 0; config_syslog = 0;
} else { } else {
int level = verb_to_mask( c->line, loglevel_ops ); i = verb_to_mask( c->line, loglevel_ops );
config_syslog ^= level; config_syslog &= ~loglevel_ops[i].mask;
} }
if ( slapMode & SLAP_SERVER_MODE ) { if ( slapMode & SLAP_SERVER_MODE ) {
ldap_syslog = config_syslog; ldap_syslog = config_syslog;