Misc. cleanup

This commit is contained in:
Kurt Zeilenga 1999-09-16 02:31:29 +00:00
parent cb99b10783
commit ccfba5f2c0
3 changed files with 7 additions and 4 deletions

View File

@ -620,12 +620,11 @@ aci_list_has_right (struct berval *list, int access, int action)
right = 0;
break;
}
#ifdef SLAPD_ACI_DISCRETE_RIGHTS
if (right & access) {
return(action);
}
}
return(!action);
#else
if (action != 0) {
/* check granted */
@ -636,7 +635,12 @@ aci_list_has_right (struct berval *list, int access, int action)
if (right <= access)
return(1);
}
#endif
}
#ifdef SLAPD_ACI_DISCRETE_RIGHTS
return(!action);
#else
return(0);
#endif
}

View File

@ -61,7 +61,7 @@ ldap_pvt_thread_mutex_t num_sent_mutex;
ldap_pvt_thread_mutex_t entry2str_mutex;
ldap_pvt_thread_mutex_t replog_mutex;
static char* slap_name;
static char* slap_name = NULL;
int slapMode = SLAP_UNDEFINED_MODE;
static ldap_pvt_thread_mutex_t currenttime_mutex;

View File

@ -13,7 +13,6 @@
#include "portable.h"
#include <stdio.h>
#include <ac/string.h>
#include "slap.h"