389-commits November 2011

389-commits@lists.fedoraproject.org

3 participants
17 discussions

ldap/servers
by Richard Allen Megginson 17 Nov '11

17 Nov '11

ldap/servers/plugins/cos/cos_cache.c | 23 +----------- ldap/servers/slapd/dn.c | 23 ++---------- ldap/servers/slapd/proto-slap.h | 1 ldap/servers/slapd/str2filter.c | 4 +- ldap/servers/slapd/uniqueid.c | 67 +++++++++-------------------------- ldap/servers/slapd/util.c | 6 +-- 6 files changed, 28 insertions(+), 96 deletions(-) New commits: commit d439e3a27820c3bed54f65b5e0e48b9b32cbe98a Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Nov 17 09:41:06 2011 -0700 use slapi_hexchar2int and slapi_str_to_u8 everywhere uniqueid code was using local str2Byte - use slapi_str_to_u8 instead there were several places using a copy of the old hexchar2int - change them to use slapi_hexchar2int instead Reviewed by: nkinder (Thanks!) diff --git a/ldap/servers/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c index 6265728..b2237ee 100644 --- a/ldap/servers/plugins/cos/cos_cache.c +++ b/ldap/servers/plugins/cos/cos_cache.c @@ -326,8 +326,6 @@ static int cos_cache_vattr_compare(vattr_sp_handle *handle, vattr_context *c, Sl static int cos_cache_vattr_types(vattr_sp_handle *handle,Slapi_Entry *e,vattr_type_list_context *type_context,int flags); static int cos_cache_query_attr(cos_cache *ptheCache, vattr_context *context, Slapi_Entry *e, char *type, Slapi_ValueSet **out_attr, Slapi_Value *test_this, int *result, int *ops); -static int hexchar2int( char c ); - /* compares s2 to s1 starting from end of string until the beginning of either matches result in the s2 value being clipped from s1 with a NULL char @@ -1986,8 +1984,8 @@ static int cos_cache_add_tmpl(cosTemplates **pTemplates, cosAttrValue *dn, cosAt if ((index+2 <= lastindex) && isxdigit(dn->val[index+1]) && isxdigit(dn->val[index+2])) { /* Convert ESC HEX HEX to a real char */ - int n = hexchar2int(dn->val[index+1]); - int n2 = hexchar2int(dn->val[index+2]); + int n = slapi_hexchar2int(dn->val[index+1]); + int n2 = slapi_hexchar2int(dn->val[index+2]); n = (n << 4) + n2; if (n == 0) { /* don't change \00 */ grade[grade_index] = dn->val[index++]; /* '\\' */ @@ -3648,20 +3646,3 @@ static int cos_cache_entry_is_cos_related( Slapi_Entry *e) { } return(rc); } - -/* copied from dn.c */ -static int -hexchar2int( char c ) -{ - if ( '0' <= c && c <= '9' ) { - return( c - '0' ); - } - if ( 'a' <= c && c <= 'f' ) { - return( c - 'a' + 10 ); - } - if ( 'A' <= c && c <= 'F' ) { - return( c - 'A' + 10 ); - } - return( -1 ); -} - diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c index ec92790..4c04ae5 100644 --- a/ldap/servers/slapd/dn.c +++ b/ldap/servers/slapd/dn.c @@ -62,21 +62,6 @@ static int rdn_av_cmp( struct berval *av1, struct berval *av2 ); static void rdn_av_swap( struct berval *av1, struct berval *av2, int escape ); -int -hexchar2int( char c ) -{ - if ( '0' <= c && c <= '9' ) { - return( c - '0' ); - } - if ( 'a' <= c && c <= 'f' ) { - return( c - 'a' + 10 ); - } - if ( 'A' <= c && c <= 'F' ) { - return( c - 'A' + 10 ); - } - return( -1 ); -} - #define ISBLANK(c) ((c) == ' ') #define ISBLANKSTR(s) (((*(s)) == '2') && (*((s)+1) == '0')) #define ISSPACE(c) (ISBLANK(c) || ((c) == '\n') || ((c) == '\r')) /* XXX 518524 */ @@ -398,9 +383,9 @@ substr_dn_normalize_orig( char *dn, char *end ) } else { gotesc = 1; if ( s+2 < end ) { - int n = hexchar2int( s[1] ); + int n = slapi_hexchar2int( s[1] ); if ( n >= 0 && n < 16 ) { - int n2 = hexchar2int( s[2] ); + int n2 = slapi_hexchar2int( s[2] ); if ( n2 >= 0 ) { n = (n << 4) + n2; if (n == 0) { /* don't change \00 */ @@ -841,8 +826,8 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len) } else if (s + 2 < ends && isxdigit(*(s+1)) && isxdigit(*(s+2))) { /* esc hexpair ==> real character */ - int n = hexchar2int(*(s+1)); - int n2 = hexchar2int(*(s+2)); + int n = slapi_hexchar2int(*(s+1)); + int n2 = slapi_hexchar2int(*(s+2)); n = (n << 4) + n2; if (n == 0) { /* don't change \00 */ *d++ = *++s; diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index 69a7554..9964043 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -571,7 +571,6 @@ void raise_process_limits( void ); * dn.c */ char *substr_dn_normalize( char *dn, char *end ); -int hexchar2int( char c ); /* diff --git a/ldap/servers/slapd/str2filter.c b/ldap/servers/slapd/str2filter.c index 9ffcf24..e6a9996 100644 --- a/ldap/servers/slapd/str2filter.c +++ b/ldap/servers/slapd/str2filter.c @@ -213,7 +213,7 @@ filt_unescape_str(const char *instr, char *outstr, size_t outsize, size_t* outle { if (! *(++inp)) return 0; /* fail */ - if (((ival = hexchar2int(inp[0])) < 0) || (hexchar2int(inp[1]) < 0)) + if (((ival = slapi_hexchar2int(inp[0])) < 0) || (slapi_hexchar2int(inp[1]) < 0)) { /* LDAPv2 (RFC1960) escape sequence */ *outp++ = *inp; @@ -224,7 +224,7 @@ filt_unescape_str(const char *instr, char *outstr, size_t outsize, size_t* outle /* LDAPv3 hex escape sequence */ if (! *(++inp)) return 0; /* fail */ - *outp = (ival << 4) | hexchar2int(*inp); + *outp = (ival << 4) | slapi_hexchar2int(*inp); if ((!binary) && (!*outp)) return 0; /* fail: "\00" not allowed unless it's binary */ outp++; diff --git a/ldap/servers/slapd/uniqueid.c b/ldap/servers/slapd/uniqueid.c index 7764465..979e06b 100644 --- a/ldap/servers/slapd/uniqueid.c +++ b/ldap/servers/slapd/uniqueid.c @@ -221,25 +221,25 @@ int slapi_uniqueIDScan (Slapi_UniqueID *uId, const char *buff){ return UID_BADDATA; } - ((PRUint8 *) &uId->time_low)[0] = str2Byte (&(buff[0])); - ((PRUint8 *) &uId->time_low)[1] = str2Byte (&(buff[2])); - ((PRUint8 *) &uId->time_low)[2] = str2Byte (&(buff[4])); - ((PRUint8 *) &uId->time_low)[3] = str2Byte (&(buff[6])); + ((PRUint8 *) &uId->time_low)[0] = slapi_str_to_u8 (&(buff[0])); + ((PRUint8 *) &uId->time_low)[1] = slapi_str_to_u8 (&(buff[2])); + ((PRUint8 *) &uId->time_low)[2] = slapi_str_to_u8 (&(buff[4])); + ((PRUint8 *) &uId->time_low)[3] = slapi_str_to_u8 (&(buff[6])); /* next field is at 9 because we skip the - */ - ((PRUint8 *) &uId->time_mid)[0] = str2Byte (&(buff[9])); - ((PRUint8 *) &uId->time_mid)[1] = str2Byte (&(buff[11])); - ((PRUint8 *) &uId->time_hi_and_version)[0] = str2Byte (&(buff[13])); - ((PRUint8 *) &uId->time_hi_and_version)[1] = str2Byte (&(buff[15])); + ((PRUint8 *) &uId->time_mid)[0] = slapi_str_to_u8 (&(buff[9])); + ((PRUint8 *) &uId->time_mid)[1] = slapi_str_to_u8 (&(buff[11])); + ((PRUint8 *) &uId->time_hi_and_version)[0] = slapi_str_to_u8 (&(buff[13])); + ((PRUint8 *) &uId->time_hi_and_version)[1] = slapi_str_to_u8 (&(buff[15])); /* next field is at 18 because we skip the - */ - uId->clock_seq_hi_and_reserved = str2Byte (&(buff[18])); - uId->clock_seq_low = str2Byte (&(buff[20])); - uId->node[0] = str2Byte (&(buff[22])); - uId->node[1] = str2Byte (&(buff[24])); + uId->clock_seq_hi_and_reserved = slapi_str_to_u8 (&(buff[18])); + uId->clock_seq_low = slapi_str_to_u8 (&(buff[20])); + uId->node[0] = slapi_str_to_u8 (&(buff[22])); + uId->node[1] = slapi_str_to_u8 (&(buff[24])); /* next field is at 27 because we skip the - */ - uId->node[2] = str2Byte (&(buff[27])); - uId->node[3] = str2Byte (&(buff[29])); - uId->node[4] = str2Byte (&(buff[31])); - uId->node[5] = str2Byte (&(buff[33])); + uId->node[2] = slapi_str_to_u8 (&(buff[27])); + uId->node[3] = slapi_str_to_u8 (&(buff[29])); + uId->node[4] = slapi_str_to_u8 (&(buff[31])); + uId->node[5] = slapi_str_to_u8 (&(buff[33])); uId->time_low = ntohl(uId->time_low); uId->time_mid = ntohs(uId->time_mid); @@ -288,49 +288,18 @@ Slapi_UniqueID* slapi_uniqueIDDup (Slapi_UniqueID *uId) /* helper functions */ -static char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', '\0'}; -/* this function converts a string representation of a byte in hex into - an actual byte. For instance: "AB" -> 171 */ -static PRUint8 str2Byte (const char *str) -{ - char letter1 = str[0]; - char letter2 = str[1]; - PRUint8 num = 0; - int i = 0; - - while (hexDigits[i] != '\0') - { - if (letter1 == hexDigits[i] || toupper (letter1) == hexDigits[i]) - { - num |= (i << 4); - } - - if (letter2 == hexDigits[i] || toupper (letter2) == hexDigits[i]) - { - num |= i; - } - - i++; - } - - return num; -} - static char* format = "XXXXXXXX-XXXXXXXX-XXXXXXXX-XXXXXXXX"; +static size_t format_len = 35; /* This function verifies that buff contains data in the correct format (specified above). */ static int isValidFormat (const char * buff) { - int len; int i; if (strlen (buff) != strlen (format)) return UID_BADDATA; - len = strlen (format); - - for (i = 0; i < len; i++) + for (i = 0; i < format_len; i++) { if (format[i] == '-' && buff [i] != '-') return 0; diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index 58d4dfa..fd5ebcb 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -231,9 +231,9 @@ strcpy_unescape_value( char *d, const char *s ) case '\\': gotesc = 1; if ( s+2 < end ) { - int n = hexchar2int( s[1] ); + int n = slapi_hexchar2int( s[1] ); if ( n >= 0 && n < 16 ) { - int n2 = hexchar2int( s[2] ); + int n2 = slapi_hexchar2int( s[2] ); if ( n2 >= 0 ) { n = (n << 4) + n2; if (n == 0) { /* don't change \00 */ @@ -1024,8 +1024,6 @@ static const int char2intarray[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; -static const int char2intarray_size = sizeof(char2intarray)/sizeof(char2intarray[0]); - int slapi_hexchar2int(char c) {

1 0

ldap/servers
by Richard Allen Megginson 17 Nov '11

17 Nov '11

ldap/servers/slapd/csn.c | 64 +++++++++++------------------ ldap/servers/slapd/slapi-plugin.h | 47 +++++++++++++++++++++ ldap/servers/slapd/util.c | 83 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 39 deletions(-) New commits: commit 591055105f700ceb0b40cccb76ccd55d0370f63c Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Nov 16 17:34:46 2011 -0700 csn_init_as_string should not use sscanf Added new slapi functions to convert decimal/hex strings to their integral values. Use these in csn_init_as_string to convert the csn string values to their integral values. Similar to removing sprintf, using these functions instead of sscanf provides a large performance gain. I also got rid of the use of PR_Counter in favor of slapi_counter, and only use the counters if DEBUG is set. Reviewed by: nkinder (Thanks!) diff --git a/ldap/servers/slapd/csn.c b/ldap/servers/slapd/csn.c index 0480036..9fb5b4a 100644 --- a/ldap/servers/slapd/csn.c +++ b/ldap/servers/slapd/csn.c @@ -47,19 +47,6 @@ #include <string.h> #include "slap.h" -#include <prcountr.h> - -#define _CSN_TSTAMP_STRSIZE_STR "8" -#define _CSN_SEQNUM_STRSIZE_STR "4" -#define _CSN_REPLID_STRSIZE_STR "4" -#define _CSN_SUBSEQNUM_STRSIZE_STR "4" - -#define _CSN_TSTAMP_SCANSTR "%"_CSN_TSTAMP_STRSIZE_STR"lx" -#define _CSN_SEQNUM_SCANSTR "%"_CSN_SEQNUM_STRSIZE_STR"hx" -#define _CSN_REPLID_SCANSTR "%"_CSN_REPLID_STRSIZE_STR"hx" -#define _CSN_SUBSEQNUM_SCANSTR "%"_CSN_SUBSEQNUM_STRSIZE_STR"hx" - -#define _CSN_TSORDER_SPRINTSTR "%08x%04x%04x%04x" #define _CSN_TSORDER_TSTAMP_OFFSET 0 #define _CSN_TSORDER_SEQNUM_OFFSET 8 @@ -71,10 +58,12 @@ static PRBool _csnIsValidString(const char *csnStr); /* * Debugging counters. */ +#ifdef DEBUG static int counters_created= 0; -PR_DEFINE_COUNTER(slapi_csn_counter_created); -PR_DEFINE_COUNTER(slapi_csn_counter_deleted); -PR_DEFINE_COUNTER(slapi_csn_counter_exist); +static Slapi_Counter *slapi_csn_counter_created; +static Slapi_Counter *slapi_csn_counter_deleted; +static Slapi_Counter *slapi_csn_counter_exist; +#endif /* * ************************************************************************** @@ -82,23 +71,27 @@ PR_DEFINE_COUNTER(slapi_csn_counter_exist); * ************************************************************************** */ +#ifdef DEBUG static void csn_create_counters() { - PR_CREATE_COUNTER(slapi_csn_counter_created,"Slapi_CSN","created",""); - PR_CREATE_COUNTER(slapi_csn_counter_deleted,"Slapi_CSN","deleted",""); - PR_CREATE_COUNTER(slapi_csn_counter_exist,"Slapi_CSN","exist",""); + slapi_csn_counter_created = slapi_counter_new(); + slapi_csn_counter_deleted = slapi_counter_new(); + slapi_csn_counter_exist = slapi_counter_new(); counters_created= 1; } +#endif CSN *csn_new() { +#ifdef DEBUG if(!counters_created) { csn_create_counters(); } - PR_INCREMENT_COUNTER(slapi_csn_counter_created); - PR_INCREMENT_COUNTER(slapi_csn_counter_exist); + slapi_counter_increment(slapi_csn_counter_created); + slapi_counter_increment(slapi_csn_counter_exist); +#endif return (CSN*)slapi_ch_calloc(sizeof(CSN),1); } @@ -138,22 +131,13 @@ void csn_init_by_csn(CSN *csn1,const CSN *csn2) void csn_init_by_string(CSN *csn, const char *s) { - time_t csnTime= 0; - PRUint16 csnSeqNum= 0; - ReplicaId rid= 0; - PRUint16 csnSubSeqNum= 0; - - if(_csnIsValidString(s)) - { - /* JCM - char2hex faster */ - sscanf((s+_CSN_TSORDER_TSTAMP_OFFSET), _CSN_TSTAMP_SCANSTR, &csnTime); /* JCM - scanf is very slow */ - sscanf((s+_CSN_TSORDER_SEQNUM_OFFSET), _CSN_SEQNUM_SCANSTR, &csnSeqNum);/* JCM - scanf is very slow */ - sscanf((s+_CSN_TSORDER_REPLID_OFFSET), _CSN_REPLID_SCANSTR, &rid);/* JCM - scanf is very slow */ - sscanf((s+_CSN_TSORDER_SUBSEQNUM_OFFSET), _CSN_SUBSEQNUM_SCANSTR, &csnSubSeqNum);/* JCM - scanf is very slow */ - csn->tstamp= csnTime; - csn->seqnum= csnSeqNum; - csn->rid= rid; - csn->subseqnum= csnSubSeqNum; + if(_csnIsValidString(s)) { + /* yes - time_t is long - but the CSN will only ever store the lowest 4 bytes of + the timestamp */ + csn->tstamp = slapi_str_to_u32(s+_CSN_TSORDER_TSTAMP_OFFSET); + csn->seqnum = slapi_str_to_u16(s+_CSN_TSORDER_SEQNUM_OFFSET); + csn->rid = slapi_str_to_u16(s+_CSN_TSORDER_REPLID_OFFSET); + csn->subseqnum = slapi_str_to_u16(s+_CSN_TSORDER_SUBSEQNUM_OFFSET); } } @@ -176,12 +160,14 @@ void csn_free(CSN **csn) { if(csn!=NULL && *csn!=NULL) { +#ifdef DEBUG if(!counters_created) { csn_create_counters(); } - PR_INCREMENT_COUNTER(slapi_csn_counter_deleted); - PR_DECREMENT_COUNTER(slapi_csn_counter_exist); + slapi_counter_increment(slapi_csn_counter_deleted); + slapi_counter_increment(slapi_csn_counter_exist); +#endif slapi_ch_free((void **)csn); } return; diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index 446c5f7..cc19777 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -6826,6 +6826,53 @@ char *slapi_u32_to_hex(uint32_t val, char *s, uint8_t upper); */ char *slapi_u64_to_hex(uint64_t val, char *s, uint8_t upper); +/** + * Convert a char to its integral hex value e.g. '0' -> 0 or 'a' -> 10. + * This only works on one caller at a time. If you want to convert a string + * of decimal/hex numbers to its integral value, see slapi_str_to_u8 et. al. + * This uses a lookup table so it should be extremely fast. + * + * \param c character value to convert + * \return integral value of the given char or -1 if not a valid decimal/hex digit + */ +int slapi_hexchar2int(char c); + +/** + * Convert a string of 2 decimal/hex characters to a 1 byte (8-bit) unsigned value. + * This function does no checking - it assumes s is non-NULL and well-formed. + * + * \param s convert the first 2 chars of this decimal/hex char string to its integral value + * \return the integral value + */ +uint8_t slapi_str_to_u8(const char *s); + +/** + * Convert a string of 4 decimal/hex characters to a 2 byte (16-bit) unsigned value. + * This function does no checking - it assumes s is non-NULL and well-formed. + * + * \param s convert the first 4 chars of this decimal/hex char string to its integral value + * \return the integral value + */ +uint16_t slapi_str_to_u16(const char *s); + +/** + * Convert a string of 8 decimal/hex characters to a 4 byte (32-bit) unsigned value. + * This function does no checking - it assumes s is non-NULL and well-formed. + * + * \param s convert the first 8 chars of this decimal/hex char string to its integral value + * \return the integral value + */ +uint32_t slapi_str_to_u32(const char *s); + +/** + * Convert a string of 16 decimal/hex characters to a 8 byte (64-bit) unsigned value. + * This function does no checking - it assumes s is non-NULL and well-formed. + * + * \param s convert the first 16 chars of this decimal/hex char string to its integral value + * \return the integral value + */ +uint64_t slapi_str_to_u64(const char *s); + #ifdef __cplusplus } #endif diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index e2970b4..58d4dfa 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -1004,3 +1004,86 @@ slapi_u64_to_hex(uint64_t val, char *s, uint8_t upper) { s[15] = digits[val & 0xf]; return &s[16]; } + +static const int char2intarray[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 +}; + +static const int char2intarray_size = sizeof(char2intarray)/sizeof(char2intarray[0]); + +int +slapi_hexchar2int(char c) +{ + return char2intarray[(unsigned char)c]; +} + +uint8_t +slapi_str_to_u8(const char *s) +{ + uint8_t v0 = (uint8_t)slapi_hexchar2int(s[0]); + uint8_t v1 = (uint8_t)slapi_hexchar2int(s[1]); + return (v0 << 4) | v1; +} + +uint16_t +slapi_str_to_u16(const char *s) +{ + uint16_t v0 = (uint16_t)slapi_hexchar2int(s[0]); + uint16_t v1 = (uint16_t)slapi_hexchar2int(s[1]); + uint16_t v2 = (uint16_t)slapi_hexchar2int(s[2]); + uint16_t v3 = (uint16_t)slapi_hexchar2int(s[3]); + return (v0 << 12) | (v1 << 8) | (v2 << 4) | v3; +} + +uint32_t +slapi_str_to_u32(const char *s) +{ + uint32_t v0 = (uint32_t)slapi_hexchar2int(s[0]); + uint32_t v1 = (uint32_t)slapi_hexchar2int(s[1]); + uint32_t v2 = (uint32_t)slapi_hexchar2int(s[2]); + uint32_t v3 = (uint32_t)slapi_hexchar2int(s[3]); + uint32_t v4 = (uint32_t)slapi_hexchar2int(s[4]); + uint32_t v5 = (uint32_t)slapi_hexchar2int(s[5]); + uint32_t v6 = (uint32_t)slapi_hexchar2int(s[6]); + uint32_t v7 = (uint32_t)slapi_hexchar2int(s[7]); + return (v0 << 28) | (v1 << 24) | (v2 << 20) | (v3 << 16) | (v4 << 12) | (v5 << 8) | (v6 << 4) | v7; +} + +uint64_t +slapi_str_to_u64(const char *s) +{ + uint64_t v0 = (uint64_t)slapi_hexchar2int(s[0]); + uint64_t v1 = (uint64_t)slapi_hexchar2int(s[1]); + uint64_t v2 = (uint64_t)slapi_hexchar2int(s[2]); + uint64_t v3 = (uint64_t)slapi_hexchar2int(s[3]); + uint64_t v4 = (uint64_t)slapi_hexchar2int(s[4]); + uint64_t v5 = (uint64_t)slapi_hexchar2int(s[5]); + uint64_t v6 = (uint64_t)slapi_hexchar2int(s[6]); + uint64_t v7 = (uint64_t)slapi_hexchar2int(s[7]); + uint64_t v8 = (uint64_t)slapi_hexchar2int(s[8]); + uint64_t v9 = (uint64_t)slapi_hexchar2int(s[9]); + uint64_t v10 = (uint64_t)slapi_hexchar2int(s[10]); + uint64_t v11 = (uint64_t)slapi_hexchar2int(s[11]); + uint64_t v12 = (uint64_t)slapi_hexchar2int(s[12]); + uint64_t v13 = (uint64_t)slapi_hexchar2int(s[13]); + uint64_t v14 = (uint64_t)slapi_hexchar2int(s[14]); + uint64_t v15 = (uint64_t)slapi_hexchar2int(s[15]); + return (v0 << 60) | (v1 << 56) | (v2 << 52) | (v3 << 48) | (v4 << 44) | (v5 << 40) | + (v6 << 36) | (v7 << 32) | (v8 << 28) | (v9 << 24) | (v10 << 20) | (v11 << 16) | + (v12 << 12) | (v13 << 8) | (v14 << 4) | v15; +}

1 0

ldap/servers
by Richard Allen Megginson 16 Nov '11

16 Nov '11

ldap/servers/plugins/replication/cl5_api.c | 147 +++++++++++------- ldap/servers/plugins/replication/csnpl.c | 6 ldap/servers/plugins/replication/repl5_inc_protocol.c | 53 +++--- ldap/servers/plugins/replication/repl5_plugins.c | 12 - ldap/servers/plugins/replication/repl5_replica.c | 34 ++-- ldap/servers/plugins/replication/repl5_ruv.c | 41 +++-- 6 files changed, 177 insertions(+), 116 deletions(-) New commits: commit b53ba00f552fe6f66f3568e1025713ede0556b85 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Nov 15 20:26:46 2011 -0700 reduce calls to csn_as_string and slapi_log_error csn_as_string is an expensive operation - we should reduce calls to it many of these calls are in calls to slapi_log_error at the REPL log level where we want to print the csn string to the error log When we call slapi_log_error(REPL,...), any nested functions are called first, which means that even if the log level is REPL and nothing is logged, a lot of computation may occur for nothing. We should protect these calls using slapi_is_loglevel_set(). Reviewed by: nkinder (Thanks!) diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c index 2a834d7..0ea90d1 100644 --- a/ldap/servers/plugins/replication/cl5_api.c +++ b/ldap/servers/plugins/replication/cl5_api.c @@ -3532,9 +3532,11 @@ static void _cl5TrimFile (Object *obj, long *numToTrim) } else { - slapi_log_error (SLAPI_LOG_REPL, NULL, - "Changelog purge skipped anchor csn %s\n", - csn_as_string (maxcsn, PR_FALSE, strCSN)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error (SLAPI_LOG_REPL, NULL, + "Changelog purge skipped anchor csn %s\n", + csn_as_string (maxcsn, PR_FALSE, strCSN)); + } /* extra read to skip the current record */ cl5_operation_parameters_done (&op); @@ -5020,10 +5022,13 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum PR_ASSERT (supplierRuv); agmt_name = get_thread_private_agmtname(); - slapi_log_error(SLAPI_LOG_REPL, NULL, "_cl5PositionCursorForReplay (%s): Consumer RUV:\n", agmt_name); - ruv_dump (consumerRuv, agmt_name, NULL); - slapi_log_error(SLAPI_LOG_REPL, NULL, "_cl5PositionCursorForReplay (%s): Supplier RUV:\n", agmt_name); - ruv_dump (supplierRuv, agmt_name, NULL); + + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, NULL, "_cl5PositionCursorForReplay (%s): Consumer RUV:\n", agmt_name); + ruv_dump (consumerRuv, agmt_name, NULL); + slapi_log_error(SLAPI_LOG_REPL, NULL, "_cl5PositionCursorForReplay (%s): Supplier RUV:\n", agmt_name); + ruv_dump (supplierRuv, agmt_name, NULL); + } /* * get the sorted list of SupplierMinCSN (if no ConsumerMaxCSN) @@ -5054,7 +5059,6 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum continue; startCSN = csns[i]; - csn_as_string(startCSN, PR_FALSE, csnStr); rc = clcache_get_buffer ( &clcache, file->db, consumerRID, consumerRuv, supplierRuv ); if ( rc != 0 ) goto done; @@ -5085,23 +5089,28 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum if ((RUV_SUCCESS == ruv_get_min_csn(supplierRuv, &startCSN)) && startCSN) { /* must now free startCSN */ - csn_as_string(startCSN, PR_FALSE, csnStr); - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, - "%s: CSN %s not found and no purging, probably a reinit\n", - agmt_name, csnStr); - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, - "%s: Will try to use supplier min CSN %s to load changelog\n", - agmt_name, csnStr); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + csn_as_string(startCSN, PR_FALSE, csnStr); + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, + "%s: CSN %s not found and no purging, probably a reinit\n", + agmt_name, csnStr); + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, + "%s: Will try to use supplier min CSN %s to load changelog\n", + agmt_name, csnStr); + } rc = clcache_load_buffer (clcache, startCSN, DB_SET); } else { - slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, - "%s: CSN %s not found and no purging, probably a reinit\n", - agmt_name, csnStr); - slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, - "%s: Could not get the min csn from the supplier RUV\n", - agmt_name); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + csn_as_string(startCSN, PR_FALSE, csnStr); + slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, + "%s: CSN %s not found and no purging, probably a reinit\n", + agmt_name, csnStr); + slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, + "%s: Could not get the min csn from the supplier RUV\n", + agmt_name); + } rc = CL5_RUV_ERROR; goto done; } @@ -5110,8 +5119,11 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum if (rc == 0) { haveChanges = PR_TRUE; rc = CL5_SUCCESS; - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, - "%s: CSN %s found, position set for replay\n", agmt_name, csnStr); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + csn_as_string(startCSN, PR_FALSE, csnStr); + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, + "%s: CSN %s found, position set for replay\n", agmt_name, csnStr); + } if (startCSN != csns[i]) { csn_free(&startCSN); } @@ -5121,33 +5133,44 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum { /* check whether this csn should be present */ rc = _cl5CheckMissingCSN (startCSN, supplierRuv, file); + if (rc == CL5_MISSING_DATA) /* we should have had the change but we don't */ + { + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + csn_as_string(startCSN, PR_FALSE, csnStr); + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, + "%s: CSN %s not found, seems to be missing\n", agmt_name, csnStr); + } + } + else /* we are not as up to date or we purged */ + { + csn_as_string(startCSN, PR_FALSE, csnStr); + slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, + "%s: CSN %s not found, we aren't as up to date, or we purged\n", + agmt_name, csnStr); + } if (startCSN != csns[i]) { csn_free(&startCSN); } if (rc == CL5_MISSING_DATA) /* we should have had the change but we don't */ { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, - "%s: CSN %s not found, seems to be missing\n", agmt_name, csnStr); break; } else /* we are not as up to date or we purged */ { - slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, - "%s: CSN %s not found, we aren't as up to date, or we purged\n", - agmt_name, csnStr); continue; } } else { - if (startCSN != csns[i]) { - csn_free(&startCSN); - } - + csn_as_string(startCSN, PR_FALSE, csnStr); /* db error */ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, "%s: Failed to retrieve change with CSN %s; db error - %d %s\n", agmt_name, csnStr, rc, db_strerror(rc)); + if (startCSN != csns[i]) { + csn_free(&startCSN); + } + rc = CL5_DB_ERROR; break; } @@ -5369,9 +5392,11 @@ static int _cl5CheckMissingCSN (const CSN *csn, const RUV *supplierRuv, CL5DBFil { /* we have not seen any changes from this replica so it is ok not to have this csn */ - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " - "can't locate %s csn: we have not seen any changes for replica %d\n", - csn_as_string (csn, PR_FALSE, csnStr), rid); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " + "can't locate %s csn: we have not seen any changes for replica %d\n", + csn_as_string (csn, PR_FALSE, csnStr), rid); + } return CL5_SUCCESS; } @@ -5381,18 +5406,22 @@ static int _cl5CheckMissingCSN (const CSN *csn, const RUV *supplierRuv, CL5DBFil /* changelog never contained any changes for this replica */ if (csn_compare (csn, supplierCsn) <= 0) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " - "the change with %s csn was never logged because it was imported " - "during replica initialization\n", csn_as_string (csn, PR_FALSE, csnStr)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " + "the change with %s csn was never logged because it was imported " + "during replica initialization\n", csn_as_string (csn, PR_FALSE, csnStr)); + } rc = CL5_PURGED_DATA; /* XXXggood is that the correct return value? */ } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " - "change with %s csn has not yet been seen by this server; " - " last csn seen from that replica is %s\n", - csn_as_string (csn, PR_FALSE, csnStr), - csn_as_string (supplierCsn, PR_FALSE, csnStr)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " + "change with %s csn has not yet been seen by this server; " + " last csn seen from that replica is %s\n", + csn_as_string (csn, PR_FALSE, csnStr), + csn_as_string (supplierCsn, PR_FALSE, csnStr)); + } rc = CL5_SUCCESS; } } @@ -5406,20 +5435,24 @@ static int _cl5CheckMissingCSN (const CSN *csn, const RUV *supplierRuv, CL5DBFil { if (csn_compare (csn, supplierCsn) <= 0) /* we should have the data but we don't */ { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " - "change with %s csn has been purged by this server; " - "the current purge point for that replica is %s\n", - csn_as_string (csn, PR_FALSE, csnStr), - csn_as_string (purgeCsn, PR_FALSE, csnStr)); - rc = CL5_MISSING_DATA; + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " + "change with %s csn has been purged by this server; " + "the current purge point for that replica is %s\n", + csn_as_string (csn, PR_FALSE, csnStr), + csn_as_string (purgeCsn, PR_FALSE, csnStr)); + } + rc = CL5_MISSING_DATA; } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " - "change with %s csn has not yet been seen by this server; " - " last csn seen from that replica is %s\n", - csn_as_string (csn, PR_FALSE, csnStr), - csn_as_string (supplierCsn, PR_FALSE, csnStr)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckMissingCSN: " + "change with %s csn has not yet been seen by this server; " + " last csn seen from that replica is %s\n", + csn_as_string (csn, PR_FALSE, csnStr), + csn_as_string (supplierCsn, PR_FALSE, csnStr)); + } rc = CL5_SUCCESS; } } @@ -6065,8 +6098,10 @@ static int _cl5ExportFile (PRFileDesc *prFile, Object *obj) file = (CL5DBFile*)object_get_data (obj); PR_ASSERT (file); - ruv_dump (file->purgeRUV, "clpurgeruv", prFile); - ruv_dump (file->maxRUV, "clmaxruv", prFile); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + ruv_dump (file->purgeRUV, "clpurgeruv", prFile); + ruv_dump (file->maxRUV, "clmaxruv", prFile); + } slapi_write_buffer (prFile, "\n", strlen("\n")); entry.op = &op; diff --git a/ldap/servers/plugins/replication/csnpl.c b/ldap/servers/plugins/replication/csnpl.c index 70bc853..62f4fc4 100644 --- a/ldap/servers/plugins/replication/csnpl.c +++ b/ldap/servers/plugins/replication/csnpl.c @@ -172,8 +172,10 @@ int csnplInsert (CSNPL *csnpl, const CSN *csn) if (rc != 0) { char s[CSN_STRSIZE]; - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "csnplInsert: failed to insert csn (%s) into pending list\n", csn_as_string(csn,PR_FALSE,s)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "csnplInsert: failed to insert csn (%s) into pending list\n", csn_as_string(csn,PR_FALSE,s)); + } return -1; } diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c index 274a069..c9ad6fc 100644 --- a/ldap/servers/plugins/replication/repl5_inc_protocol.c +++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c @@ -57,6 +57,7 @@ Stuff to do: Perhaps these events should be properties of the main protocol. */ +#include <plstr.h> #include "repl.h" #include "repl5.h" @@ -80,12 +81,16 @@ typedef struct repl5_inc_private /* Structures used to communicate with the result reading thread */ +#ifndef UIDSTR_SIZE +#define UIDSTR_SIZE 35 /* size of the string representation of the id */ +#endif + typedef struct repl5_inc_operation { int ldap_message_id; unsigned long operation_type; - char *csn_str; - char *uniqueid; + char csn_str[CSN_STRSIZE]; + char uniqueid[UIDSTR_SIZE+1]; ReplicaId replica_id; struct repl5_inc_operation *next; } repl5_inc_operation; @@ -214,15 +219,6 @@ static repl5_inc_operation *repl5_inc_pop_operation(result_data *rd) static void repl5_inc_op_free(repl5_inc_operation *op) { - /* First free any payload */ - if (op->csn_str) - { - slapi_ch_free((void **)&(op->csn_str)); - } - if (op->uniqueid) - { - slapi_ch_free((void **)&(op->uniqueid)); - } slapi_ch_free((void**)&op); } @@ -1389,8 +1385,6 @@ replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op, int *m LDAPMod **modrdn_mods = NULL; char csn_str[CSN_STRSIZE]; /* For logging only */ - csn_as_string(op->csn, PR_FALSE, csn_str); - /* Construct the replication info control that accompanies the operation */ if (SLAPI_OPERATION_ADD == op->operation_type) { @@ -1416,14 +1410,17 @@ replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op, int *m slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "%s: replay_update: Unable to create NSDS50ReplUpdateInfoControl " "for operation with csn %s. Skipping update.\n", - agmt_get_long_name(prp->agmt), csn_str); + agmt_get_long_name(prp->agmt), csn_as_string(op->csn, PR_FALSE, csn_str)); } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "%s: replay_update: Sending %s operation (dn=\"%s\" csn=%s)\n", - agmt_get_long_name(prp->agmt), - op2string(op->operation_type), REPL_GET_DN(&op->target_address), csn_str); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "%s: replay_update: Sending %s operation (dn=\"%s\" csn=%s)\n", + agmt_get_long_name(prp->agmt), + op2string(op->operation_type), REPL_GET_DN(&op->target_address), + csn_as_string(op->csn, PR_FALSE, csn_str)); + } /* What type of operation is it? */ switch (op->operation_type) { @@ -1486,15 +1483,19 @@ replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op, int *m if (CONN_OPERATION_SUCCESS == return_value) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "%s: replay_update: Consumer successfully sent operation with csn %s\n", - agmt_get_long_name(prp->agmt), csn_str); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "%s: replay_update: Consumer successfully sent operation with csn %s\n", + agmt_get_long_name(prp->agmt), csn_as_string(op->csn, PR_FALSE, csn_str)); + } } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "%s: replay_update: Consumer could not replay operation with csn %s\n", - agmt_get_long_name(prp->agmt), csn_str); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "%s: replay_update: Consumer could not replay operation with csn %s\n", + agmt_get_long_name(prp->agmt), csn_as_string(op->csn, PR_FALSE, csn_str)); + } } return return_value; } @@ -1884,11 +1885,11 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu /* Queue the details for pickup later in the response thread */ repl5_inc_operation *sop = NULL; sop = repl5_inc_operation_new(); - sop->csn_str = slapi_ch_strdup(csn_str); + PL_strncpyz(sop->csn_str, csn_str, sizeof(sop->csn_str)); sop->ldap_message_id = message_id; sop->operation_type = entry.op->operation_type; sop->replica_id = replica_id; - sop->uniqueid = slapi_ch_strdup(uniqueid); + PL_strncpyz(sop->uniqueid, uniqueid, sizeof(sop->uniqueid)); repl5_int_push_operation(rd,sop); } } diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c index a0d45fb..c806c08 100644 --- a/ldap/servers/plugins/replication/repl5_plugins.c +++ b/ldap/servers/plugins/replication/repl5_plugins.c @@ -674,13 +674,15 @@ purge_entry_state_information (Slapi_PBlock *pb) } if (NULL != e) { - char csn_str[CSN_STRSIZE]; entry_purge_state_information(e, purge_csn); /* conntion is always null */ - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "Purged state information from entry %s up to " - "CSN %s\n", slapi_entry_get_dn(e), - csn_as_string(purge_csn, PR_FALSE, csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + char csn_str[CSN_STRSIZE]; + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "Purged state information from entry %s up to " + "CSN %s\n", slapi_entry_get_dn(e), + csn_as_string(purge_csn, PR_FALSE, csn_str)); + } } csn_free(&purge_csn); } diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c index acb7d1f..295ea72 100644 --- a/ldap/servers/plugins/replication/repl5_replica.c +++ b/ldap/servers/plugins/replication/repl5_replica.c @@ -2542,21 +2542,25 @@ int process_reap_entry (Slapi_Entry *entry, void *cb_data) if ((NULL == deletion_csn || csn_compare(deletion_csn, purge_csn) < 0) && (!is_ruv_tombstone_entry(entry))) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "_replica_reap_tombstones: removing tombstone %s " - "because its deletion csn (%s) is less than the " - "purge csn (%s).\n", - escape_string(slapi_entry_get_dn(entry), ebuf), - csn_as_string(deletion_csn, PR_FALSE, deletion_csn_str), - csn_as_string(purge_csn, PR_FALSE, purge_csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "_replica_reap_tombstones: removing tombstone %s " + "because its deletion csn (%s) is less than the " + "purge csn (%s).\n", + escape_string(slapi_entry_get_dn(entry), ebuf), + csn_as_string(deletion_csn, PR_FALSE, deletion_csn_str), + csn_as_string(purge_csn, PR_FALSE, purge_csn_str)); + } _delete_tombstone(slapi_entry_get_dn(entry), slapi_entry_get_uniqueid(entry), 0); (*num_purged_entriesp)++; } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "_replica_reap_tombstones: NOT removing tombstone " - "%s\n", escape_string(slapi_entry_get_dn(entry),ebuf)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "_replica_reap_tombstones: NOT removing tombstone " + "%s\n", escape_string(slapi_entry_get_dn(entry),ebuf)); + } } (*num_entriesp)++; @@ -2939,10 +2943,12 @@ assign_csn_callback(const CSN *csn, void *data) char ebuf[BUFSIZ]; char csn_str[CSN_STRSIZE]; /* For logging only */ /* Ack, we can't keep track of min csn. Punt. */ - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "assign_csn_callback: " - "failed to insert csn %s for replica %s\n", - csn_as_string(csn, PR_FALSE, csn_str), - escape_string(slapi_sdn_get_dn(r->repl_root), ebuf)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "assign_csn_callback: " + "failed to insert csn %s for replica %s\n", + csn_as_string(csn, PR_FALSE, csn_str), + escape_string(slapi_sdn_get_dn(r->repl_root), ebuf)); + } csnplFree(&r->min_csn_pl); } } diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c index 2e4af87..e5ddb39 100644 --- a/ldap/servers/plugins/replication/repl5_ruv.c +++ b/ldap/servers/plugins/replication/repl5_ruv.c @@ -1343,6 +1343,9 @@ ruv_dump(const RUV *ruv, char *ruv_name, PRFileDesc *prFile) int len = sizeof (buff); PR_ASSERT(NULL != ruv); + if (!slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + return; + } slapi_rwlock_rdlock (ruv->lock); @@ -1406,8 +1409,10 @@ int ruv_add_csn_inprogress (RUV *ruv, const CSN *csn) replica = ruvAddReplicaNoCSN (ruv, csn_get_replicaid (csn), NULL/*purl*/); if (replica == NULL) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: failed to add replica" - " that created csn %s\n", csn_as_string (csn, PR_FALSE, csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: failed to add replica" + " that created csn %s\n", csn_as_string (csn, PR_FALSE, csn_str)); + } rc = RUV_MEMORY_ERROR; goto done; } @@ -1416,9 +1421,11 @@ int ruv_add_csn_inprogress (RUV *ruv, const CSN *csn) /* check first that this csn is not already covered by this RUV */ if (ruv_covers_csn_internal(ruv, csn, PR_FALSE)) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: " - "the csn %s has already be seen - ignoring\n", - csn_as_string (csn, PR_FALSE, csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: " + "the csn %s has already be seen - ignoring\n", + csn_as_string (csn, PR_FALSE, csn_str)); + } rc = RUV_COVERS_CSN; goto done; } @@ -1426,21 +1433,27 @@ int ruv_add_csn_inprogress (RUV *ruv, const CSN *csn) rc = csnplInsert (replica->csnpl, csn); if (rc == 1) /* we already seen this csn */ { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: " - "the csn %s has already be seen - ignoring\n", - csn_as_string (csn, PR_FALSE, csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: " + "the csn %s has already be seen - ignoring\n", + csn_as_string (csn, PR_FALSE, csn_str)); + } rc = RUV_COVERS_CSN; } else if(rc != 0) { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: failed to insert csn %s" + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: failed to insert csn %s" " into pending list\n", csn_as_string (csn, PR_FALSE, csn_str)); + } rc = RUV_UNKNOWN_ERROR; } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: successfully inserted csn %s" - " into pending list\n", csn_as_string (csn, PR_FALSE, csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: successfully inserted csn %s" + " into pending list\n", csn_as_string (csn, PR_FALSE, csn_str)); + } rc = RUV_SUCCESS; } @@ -1508,8 +1521,10 @@ int ruv_update_ruv (RUV *ruv, const CSN *csn, const char *replica_purl, PRBool i } else { - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_update_ruv: " - "successfully committed csn %s\n", csn_as_string(csn, PR_FALSE, csn_str)); + if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_update_ruv: " + "successfully committed csn %s\n", csn_as_string(csn, PR_FALSE, csn_str)); + } } if ((max_csn = csnplRollUp(replica->csnpl, &first_csn)) != NULL)

1 0

ldap/servers
by Richard Allen Megginson 15 Nov '11

15 Nov '11

ldap/servers/slapd/uniqueid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c89726733ac7ad3e5278a1d4303ae45745e13953 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Nov 15 20:10:00 2011 -0700 fix member variable name error in slapi_uniqueIDFormat diff --git a/ldap/servers/slapd/uniqueid.c b/ldap/servers/slapd/uniqueid.c index a65bbc6..7764465 100644 --- a/ldap/servers/slapd/uniqueid.c +++ b/ldap/servers/slapd/uniqueid.c @@ -181,8 +181,8 @@ int slapi_uniqueIDFormat (const Slapi_UniqueID *uId, char **buff){ *ptr++ = '-'; ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_mid)[0], ptr, 0); ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_mid)[1], ptr, 0); - ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_high_and_version)[0], ptr, 0); - ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_high_and_version)[1], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_hi_and_version)[0], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_hi_and_version)[1], ptr, 0); *ptr++ = '-'; ptr = slapi_u8_to_hex(uuid_tmp.clock_seq_hi_and_reserved, ptr, 0); ptr = slapi_u8_to_hex(uuid_tmp.clock_seq_low, ptr, 0);

1 0

ldap/servers
by Richard Allen Megginson 15 Nov '11

15 Nov '11

ldap/servers/slapd/uniqueid.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) New commits: commit 66808e5a7840235e67ac779c54d8088c24fcf38a Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Nov 15 13:50:49 2011 -0700 uniqueid formatting - use slapi_u8_to_hex instead of sprintf Use slapi_u8_to_hex for each part of the uuid to convert to string instead of the sprintf. This is about 10-11 times faster than sprintf. I've verified that this produces uuids identical to the current sprintf based formatter. Reviewed by: nkinder (Thanks!) diff --git a/ldap/servers/slapd/uniqueid.c b/ldap/servers/slapd/uniqueid.c index adfb448..a65bbc6 100644 --- a/ldap/servers/slapd/uniqueid.c +++ b/ldap/servers/slapd/uniqueid.c @@ -152,6 +152,7 @@ int slapi_uniqueIDCompareString(const char *uuid1, const char *uuid2) */ int slapi_uniqueIDFormat (const Slapi_UniqueID *uId, char **buff){ guid_t uuid_tmp; + char *ptr; if (uId == NULL || buff == NULL) { @@ -173,16 +174,26 @@ int slapi_uniqueIDFormat (const Slapi_UniqueID *uId, char **buff){ uuid_tmp.time_mid = htons(uuid_tmp.time_mid); uuid_tmp.time_hi_and_version = htons(uuid_tmp.time_hi_and_version); - sprintf (*buff, "%2.2x%2.2x%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x-" - "%2.2x%2.2x%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x", - ((PRUint8 *) &uuid_tmp.time_low)[0], ((PRUint8 *) &uuid_tmp.time_low)[1], - ((PRUint8 *) &uuid_tmp.time_low)[2], ((PRUint8 *) &uuid_tmp.time_low)[3], - ((PRUint8 *) &uuid_tmp.time_mid)[0], ((PRUint8 *) &uuid_tmp.time_mid)[1], - ((PRUint8 *) &uuid_tmp.time_hi_and_version)[0], - ((PRUint8 *) &uuid_tmp.time_hi_and_version)[1], - uuid_tmp.clock_seq_hi_and_reserved, uuid_tmp.clock_seq_low, - uuid_tmp.node[0], uuid_tmp.node[1], uuid_tmp.node[2], - uuid_tmp.node[3], uuid_tmp.node[4], uuid_tmp.node[5]); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_low)[0], *buff, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_low)[1], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_low)[2], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_low)[3], ptr, 0); + *ptr++ = '-'; + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_mid)[0], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_mid)[1], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_high_and_version)[0], ptr, 0); + ptr = slapi_u8_to_hex(((uint8_t *)&uuid_tmp.time_high_and_version)[1], ptr, 0); + *ptr++ = '-'; + ptr = slapi_u8_to_hex(uuid_tmp.clock_seq_hi_and_reserved, ptr, 0); + ptr = slapi_u8_to_hex(uuid_tmp.clock_seq_low, ptr, 0); + ptr = slapi_u8_to_hex(uuid_tmp.node[0], ptr, 0); + ptr = slapi_u8_to_hex(uuid_tmp.node[1], ptr, 0); + *ptr++ = '-'; + ptr = slapi_u8_to_hex(uuid_tmp.node[2], ptr, 0); + ptr = slapi_u8_to_hex(uuid_tmp.node[3], ptr, 0); + ptr = slapi_u8_to_hex(uuid_tmp.node[4], ptr, 0); + ptr = slapi_u8_to_hex(uuid_tmp.node[5], ptr, 0); + *ptr = 0; return UID_SUCCESS; }

1 0

ldap/servers
by Richard Allen Megginson 15 Nov '11

15 Nov '11

ldap/servers/slapd/csn.c | 8 ++- ldap/servers/slapd/slapi-plugin.h | 88 +++++++++++++++++++++++++++++++++++ ldap/servers/slapd/util.c | 93 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 3 deletions(-) New commits: commit 580a8757bf5d323cd47ab3372746886459cfda9b Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Nov 15 11:25:56 2011 -0700 csn_as_string - use slapi_uN_to_hex instead of sprintf This introduces the following new slapi functions slapi_u8_to_hex slapi_u16_to_hex slapi_u32_to_hex slapi_u64_to_hex which convert the given unsigned integral value to a char* hexadecimal string. Using this for csn_as_string() is 7-8 times faster than sprintf. Reviewed by: nkinder (Thanks!) diff --git a/ldap/servers/slapd/csn.c b/ldap/servers/slapd/csn.c index f77086c..0480036 100644 --- a/ldap/servers/slapd/csn.c +++ b/ldap/servers/slapd/csn.c @@ -249,9 +249,11 @@ csn_as_string(const CSN *csn, PRBool replicaIdOrder, char *ss) } else { - /* JCM - hex2char would be quicker */ - sprintf(s,"%08lx%04x%04x%04x", - csn->tstamp,csn->seqnum,csn->rid, csn->subseqnum); + char *ptr = slapi_u32_to_hex(csn->tstamp, s, 0); + ptr = slapi_u16_to_hex(csn->seqnum, ptr, 0); + ptr = slapi_u16_to_hex(csn->rid, ptr, 0); + ptr = slapi_u16_to_hex(csn->subseqnum, ptr, 0); + *ptr = 0; } return s; } diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index a27f8b1..446c5f7 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -6738,6 +6738,94 @@ typedef struct _back_info_crypt_value back_info_crypt_value; #define BACK_CRYPT_OUTBUFF_EXTLEN 16 +/** + * Convert unsigned char (8 bit) value to a hex string. Writes to the string. + * The caller must ensure enough space to write 2 bytes. If the upper parameter + * is TRUE, will use upper case A-F instead of lower case a-f for hex numbers. + * Returns the address after the last byte written to encourage usage like this: + * \code + * char *ptr = slapi_u_to_hex(val, buf, 0); + * ptr = slapi_u_to_hex(val2, ptr, 0); + * ... + * ptr = slapi_u_to_hex(valN, ptr, 0); + * *ptr = 0; + * \endcode + * + * \param val unsigned value to convert to string + * \param s string to write hex value into + * \param upper if TRUE use A-F otherwise use a-f + * \return address of next char after writing value to s + * + * \note Does not null terminate s - caller is responsible for that + */ +char *slapi_u8_to_hex(uint8_t val, char *s, uint8_t upper); + +/** + * Convert unsigned short (16 bit) value to a hex string. Writes to the string. + * The caller must ensure enough space to write 4 bytes. If the upper parameter + * is TRUE, will use upper case A-F instead of lower case a-f for hex numbers. + * Returns the address after the last byte written to encourage usage like this: + * \code + * char *ptr = slapi_u_to_hex(val, buf, 0); + * ptr = slapi_u_to_hex(val2, ptr, 0); + * ... + * ptr = slapi_u_to_hex(valN, ptr, 0); + * *ptr = 0; + * \endcode + * + * \param val unsigned value to convert to string + * \param s string to write hex value into + * \param upper if TRUE use A-F otherwise use a-f + * \return address of next char after writing value to s + * + * \note Does not null terminate s - caller is responsible for that + */ +char *slapi_u16_to_hex(uint16_t val, char *s, uint8_t upper); + +/** + * Convert unsigned int (32 bit) value to a hex string. Writes to the string. + * The caller must ensure enough space to write 4 bytes. If the upper parameter + * is TRUE, will use upper case A-F instead of lower case a-f for hex numbers. + * Returns the address after the last byte written to encourage usage like this: + * \code + * char *ptr = slapi_u_to_hex(val, buf, 0); + * ptr = slapi_u_to_hex(val2, ptr, 0); + * ... + * ptr = slapi_u_to_hex(valN, ptr, 0); + * *ptr = 0; + * \endcode + * + * \param val unsigned value to convert to string + * \param s string to write hex value into + * \param upper if TRUE use A-F otherwise use a-f + * \return address of next char after writing value to s + * + * \note Does not null terminate s - caller is responsible for that + */ +char *slapi_u32_to_hex(uint32_t val, char *s, uint8_t upper); + +/** + * Convert unsigned long long (64 bit) value to a hex string. Writes to the string. + * The caller must ensure enough space to write 4 bytes. If the upper parameter + * is TRUE, will use upper case A-F instead of lower case a-f for hex numbers. + * Returns the address after the last byte written to encourage usage like this: + * \code + * char *ptr = slapi_u_to_hex(val, buf, 0); + * ptr = slapi_u_to_hex(val2, ptr, 0); + * ... + * ptr = slapi_u_to_hex(valN, ptr, 0); + * *ptr = 0; + * \endcode + * + * \param val unsigned value to convert to string + * \param s string to write hex value into + * \param upper if TRUE use A-F otherwise use a-f + * \return address of next char after writing value to s + * + * \note Does not null terminate s - caller is responsible for that + */ +char *slapi_u64_to_hex(uint64_t val, char *s, uint8_t upper); + #ifdef __cplusplus } #endif diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index b91ec12..e2970b4 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -48,6 +48,7 @@ #include <sys/param.h> #include <unistd.h> #include <pwd.h> +#include <stdint.h> #endif #include <libgen.h> #include <pk11func.h> @@ -911,3 +912,95 @@ slapd_comp_path(char *p0, char *p1) slapi_ch_free_string(&norm_p1); return rval; } + +/* + Takes an unsigned char value and converts it to a hex string. + The string s is written, and the caller must ensure s has enough + space. For hex numbers, the upper argument says to use a-f or A-F. + The return value is the address of the next char after the last one written. +*/ +char * +slapi_u8_to_hex(uint8_t val, char *s, uint8_t upper) { + static char ldigits[] = "0123456789abcdef"; + static char udigits[] = "0123456789ABCDEF"; + char *digits; + + if (upper) { + digits = udigits; + } else { + digits = ldigits; + } + s[0] = digits[val >> 4]; + s[1] = digits[val & 0xf]; + return &s[2]; +} + +char * +slapi_u16_to_hex(uint16_t val, char *s, uint8_t upper) { + static char ldigits[] = "0123456789abcdef"; + static char udigits[] = "0123456789ABCDEF"; + char *digits; + + if (upper) { + digits = udigits; + } else { + digits = ldigits; + } + s[0] = digits[val >> 12]; + s[1] = digits[(val >> 8) & 0xf]; + s[2] = digits[(val >> 4) & 0xf]; + s[3] = digits[val & 0xf]; + return &s[4]; +} + +char * +slapi_u32_to_hex(uint32_t val, char *s, uint8_t upper) { + static char ldigits[] = "0123456789abcdef"; + static char udigits[] = "0123456789ABCDEF"; + char *digits; + + if (upper) { + digits = udigits; + } else { + digits = ldigits; + } + s[0] = digits[val >> 28]; + s[1] = digits[(val >> 24) & 0xf]; + s[2] = digits[(val >> 20) & 0xf]; + s[3] = digits[(val >> 16) & 0xf]; + s[4] = digits[(val >> 12) & 0xf]; + s[5] = digits[(val >> 8) & 0xf]; + s[6] = digits[(val >> 4) & 0xf]; + s[7] = digits[val & 0xf]; + return &s[8]; +} + +char * +slapi_u64_to_hex(uint64_t val, char *s, uint8_t upper) { + static char ldigits[] = "0123456789abcdef"; + static char udigits[] = "0123456789ABCDEF"; + char *digits; + + if (upper) { + digits = udigits; + } else { + digits = ldigits; + } + s[0] = digits[val >> 60]; + s[1] = digits[(val >> 56) & 0xf]; + s[2] = digits[(val >> 52) & 0xf]; + s[3] = digits[(val >> 48) & 0xf]; + s[4] = digits[(val >> 44) & 0xf]; + s[5] = digits[(val >> 40) & 0xf]; + s[6] = digits[(val >> 36) & 0xf]; + s[7] = digits[(val >> 32) & 0xf]; + s[8] = digits[(val >> 28) & 0xf]; + s[9] = digits[(val >> 24) & 0xf]; + s[10] = digits[(val >> 20) & 0xf]; + s[11] = digits[(val >> 16) & 0xf]; + s[12] = digits[(val >> 12) & 0xf]; + s[13] = digits[(val >> 8) & 0xf]; + s[14] = digits[(val >> 4) & 0xf]; + s[15] = digits[val & 0xf]; + return &s[16]; +}

1 0

ldap/servers
by Richard Allen Megginson 09 Nov '11

09 Nov '11

ldap/servers/slapd/connection.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 55106fe77d2c834b0ba866d440bb8ce08c1d01ff Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Nov 9 13:05:39 2011 -0700 Bug 751645 - crash when simple paged fails to send entry to client https://bugzilla.redhat.com/show_bug.cgi?id=751645 Resolves: bug 751645 Bug Description: crash when simple paged fails to send entry to client Reviewed by: nkinder,nhosoi (Thanks!) Branch: master Fix Description: The crash happens when the server is sending back the paged result entry responses to the client and there is a problem with the connection e.g. the client closes the socket while the server is doing the PR_Send/PR_Write on the client socket. If the reader thread in connection_read_operation() sees the close first, it will call disconnect_server() to disconnect the socket and cleanup the pagedresult structure back_search_result_set in the Connection*. The problem with this is that it leaves a dangling reference to the pagedresult structures in the writer thread in ldbm_back_next_search_entry_ext. When that code sees the error from the write, it will also attempt to free the search result, and will get an invalid or double free error. The solution is to not do the pagedresults_cleanup in disconnect_server(), but instead allow the writer thread to do the cleanup safely. The connection_cleanup() function will call pagedresults_cleanup() to avoid any memory leaks. The only thing the disconnect_server() function needs to do is to reset the c_timelimit to avoid the "slapd stops responding" and "simple paged results timeout" problems. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c index b95759a..27e4fe1 100644 --- a/ldap/servers/slapd/connection.c +++ b/ldap/servers/slapd/connection.c @@ -2766,9 +2766,7 @@ disconnect_server_nomutex( Connection *conn, PRUint64 opconnid, int opid, PRErro conn->c_gettingber = 0; connection_abandon_operations( conn ); - - pagedresults_cleanup(conn, 0 /* already locked */); /* In case the connection is on pagedresult. - Better to call it after the op is abandened. */ + conn->c_timelimit = 0; /* needed here to ensure simple paged results timeout properly and don't impact subsequent ops */ if (! config_check_referral_mode()) { /*

1 0

wrappers/initscript.in
by Nathan Kinder 08 Nov '11

08 Nov '11

wrappers/initscript.in | 1 + 1 file changed, 1 insertion(+) New commits: commit d32deaacd704534197b7b9a3f9b8ffec2a150e8a Author: Nathan Kinder <nkinder(a)redhat.com> Date: Tue Nov 8 10:16:20 2011 -0800 Bug 752155 - Use restorecon after creating init script lock file We need to call restorecon to ensure that the proper selinux context is set on the init script lock file after the init script creates it. diff --git a/wrappers/initscript.in b/wrappers/initscript.in index 7632749..da5f6bb 100644 --- a/wrappers/initscript.in +++ b/wrappers/initscript.in @@ -261,6 +261,7 @@ start() { done if [ $successes -ge 1 ]; then touch $lockfile + [ -x /sbin/restorecon ] && /sbin/restorecon $lockfile fi if [ $errors -ge 1 ]; then echo " *** Warning: $errors instance(s) failed to start"

1 0

VERSION.sh
by Richard Allen Megginson 04 Nov '11

04 Nov '11

VERSION.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a1bbff049976e9a3e7cbb6161ed44c8c02a3479 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Nov 4 17:34:06 2011 -0600 bump version to 1.2.10.a6 diff --git a/VERSION.sh b/VERSION.sh index f0e4468..701bddc 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -14,7 +14,7 @@ VERSION_MAINT=10 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel -VERSION_PREREL=.a5 +VERSION_PREREL=.a6 # NOTES on VERSION_PREREL # use aN for an alpha release e.g. a1, a2, etc. # use rcN for a release candidate e.g. rc1, rc2, etc.

1 0

Changes to 'refs/tags/389-ds-base-1.2.10.a5'
by Richard Allen Megginson 04 Nov '11

04 Nov '11

Changes since 389-ds-base-1.2.6.a1: Endi S. Dewata (168): Bug 545620 - Password cannot start with minus sign Bug 538525 - Ability to create instance as non-root user Bug 570542 - Root password cannot contain matching curly braces Bug 470684 - Pam_passthru plugin doesn't verify account activation Bug 573375 - MODRDN operation not logged Bug 520151 - Error when modifying userPassword with proxy user Bug 455489 - Address compiler warnings about strict-aliasing rules Bug 566320 - RFE: add exception to removal of attributes in cn=config for aci Bug 566043 - startpid file is only cleaned by initscript runs Bug 584109 - Slapd crashes while parsing DNA configuration Bug 542570 - Directory Server port number is not validated in the beginning. Bug 145181 - Plugin target/bind subtrees only take 1 value. Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 628096 - spurious error message from /sbin/service when doing a stop on no instances Bug 573889 - Migration does not remove deprecated schema Bug 606545 - core schema should include numSubordinates Bug 643979 - Strange byte sequence for attribute with no values (nsslapd-referral) Endi Sukma Dewata (16): Bug 630092 - Coverity #12117: Resource leaks issues Bug 630092 - Coverity #15478: Resource leaks issues Bug 630092 - Coverity #15479: Resource leaks issues Bug 630092 - Coverity #15481: Resource leaks issues Bug 630092 - Coverity #15482: Resource leaks issues Bug 630092 - Coverity #15483: Resource leaks issues Bug 630092 - Coverity #15484: Resource leaks issues Bug 630092 - Coverity #15485: Resource leaks issues Bug 630092 - Coverity #15487: Resource leaks issues Bug 630092 - Coverity #15490: Resource leaks issues Bug 630092 - Coverity #15497: Resource leaks issues Bug 630092 - Coverity #11991: Resource leaks issues Bug 630092 - Coverity #12000: Resource leaks issues Bug 630092 - Coverity #12003: Resource leaks issues Bug 630092 - Coverity #11985: Resource leaks issues Bug 630092 - Coverity #11992,11993: Resource leaks issues Nathan Kinder (186): Bug 549554 - Trim single-valued attributes before sending to AD Improve search for pcre header file Bug 434735 - Allow SASL ANONYMOUS mech to work Bug 570912 - Avoid selinux context conflict with httpd Allow instance name to be parsed from start-slapd Add managed entries plug-in Bug 572355 - Label instance files and ports during upgrade. Bug 578863 - Password modify extop needs to send referrals on replicas Bug 584156 - Remove ldapi socket file during upgrade Fix rsearch usage of name files for random filters Bug 584497 - Allow DNA plugin to set same value on multiple attributes Add replication session hooks Correct function prototype for repl session hook Bug 592389 - Set anonymous resource limits properly Bug 601433 - Add man pages for start-dirsrv and related commands Bug 604263 - Fix memory leak when password change is rejected Bug 612242 - membership change on DS does not show on AD Bug 613833 - Allow dirsrv_t to bind to rpc ports Bug 594745 - Get rid of dirsrv_lib_t label Bug 620927 - Allow multiple membership attributes in memberof plugin Bug 612264 - ACI issue with (targetattr='userPassword') Bug 630098 - fix coverity Defect Type: Code maintainability issues Bug 630098 - fix coverity Defect Type: Code maintainability issues Bug 630093 - (cov#15511) Don't use unintialized search_results in refint plugin Bug 630093 - (cov#15518) Need to intialize fd in ldbm2ldif code Bug 630096 - (cov#11778) check return value of ldap_parse_result Bug 630096 - (cov#15446) check return value of ber_scanf() Bug 630096 - (cov#15449,15450) Check return value of stat() Bug 630096 - (cov#15448) Check return value of cache_replace() Bug 630096 - (cov#15447) - Check return value of idl_append_extend() Bug 630090 - (cov#11974) Remove unused ACL functions Bug 630090 - (cov#15445) Fix illegal free in archive code Bug 630094 - (cov#11818) Fix unreachable return in snmp subagent Bug 630094 - (cov#15451) Get rid of unreachable free statements Bug 630094 - (cov#15452) Remove NULL checking for op_string Bug 630094 - (cov#15453) Eliminate NULL check for local_newentry Bug 630094 - (cov#15454) Fix deadcode issue in mapping tree code Bug 630094 - (cov#15455) Remove deadcode in attr_index_config() Bug 630094 - (cov#15456) Remove NULL check for srdn in import code Bug 630094 - (cov#15457) Remove deadcode in import code Bug 630094 - (cov#15458) Fix deadcode issue in moddn code Bug 630094 - (cov#15459) Remove NULL check for srdn in ldif2ldbm code Bug 630094 - (cov#15520) Fix unreachable code issue if perfctrs code Bug 630094 - (cov#15581) Add missing breaks in agt_mopen_stats() Bug 690090 - (cov#11974) Remove additional unused ACL functions Bug 630091 - (cov#15512) Fix usage of uninitialized bervals Bug 630091 - (cov#15513) Fix usage of uninitialized bervals Bug 630091 - (cov#15514) Initialize DBT in entryrdn_get_parent() Bug 630091 - (cov#15515) Use of uninitialized array in index config code Bug 630091 - (cov#15516,15517) Initialize pointers before attempting to free Bug 630091 - (cov#15519) Initialize bervals in search_easter_egg() Bug 630091 - (cov#15582) Free of uninitialized pointer in attr_index_config() Bug 630097 - (cov#11933) Fix NULL dereference in schema code Bug 630097 - (cov#11938) NULL dereference in mmldif Bug 630097 - (cov#11946) NULL dereference in ResHashCreate() Bug 630097 - (cov#11964) Remove dead code from libaccess Bug 630097 - (cov#12143) NULL dereference in cos cache code Bug 630097 - (cov#12148) NULL dereference in ruvInit() Bug 630097 - (cov#12182,12183) NULL dereference in import code Bug 630097 - (cov#15460) NULL deference in ACL URL code Bug 630097 - (cov#15461) Remove unnecessary NULL check in DNA Bug 630097 - (cov#15462) NULL dereference in mep_modrdn_post_op() Bug 630097 - (cov#15463) Remove NULL check in referint plugin Bug 630097 - (cov#15464) NULL dereference in repl code Bug 630097 - (cov#15465) Null dereference in USN code Bug 630097 - (cov#15473) NULL dereference in ResHashCreate() Bug 630097 - (cov#15505) NULL dereference in memberOf code Bug 630097 - (cov#15506) NULL dereference in dblayer code Bug 630097 - (cov#15507,15508) NULL dereference in entryrdn code Bug 630097 - (cov#15509) NULL dereference in idsktune Bug 630097 - (cov#11938) NULL dereference in mmldif Bug 630097 - (cov#15477) NULL dereference in ACL plug-in code Bug 630091 - (cov#12209) Use of uninitialized pointer in libaccess Bug 630092 - (cov#12116) Resource leak in ldclt code Bug 630092 - (cov#12105) Resource leak in pwdscheme config code Bug 630092 - (cov#12068) Resource leak in certmap code Bug 630091 - (cov#11973) Array overrun in libaccess Bug 522055 - Scope check for managed attribute fails Bug 625335 - Self-write aci has permission to invalid attribute Bug 631993 - Log authzid when proxy auth control is used Cov #16300 - Unused variable in account policy plugin Bug 544321 - remove-ds.pl should not throw error unlabelling port Bug 555955 - Allow CoS values to be merged Bug 643937 - Initialize replication version flags Bug 305131 - Allow empty modify operation Bug 619633 - Make attribute uniqueness obey requiredObjectClass Bug 619623 - attr-unique-plugin ignores requiredObjectClass on modrdn operations Bug 189985 - Improve attribute uniqueness error message Bug 647932 - multiple memberOf configuration adding memberOf where there is no member Bug 521088 - DNA should check ACLs before getting a value from the range Bug 635009 - Add one-way AD sync capability Bump VERSION.sh to 1.2.8.a1 Bug 648949 - Move selinux policy into base OS Bug 648949 - Update configure Roll back VERSION.sh for 1.2.7 release Bug 625950 - hash nsslapd-rootpw changes in audit log Bug 656392 - Remove calls to ber_err_print() Bug 656515 - Allow Name and Optional UID syntax for grouping attributes Bug 197886 - Avoid overflow of UUID generator Bug 658312 - Allow mapped attribute types to be quoted Bug 197886 - Initialize return value for UUID generation code Bug 658309 - Process escaped characters in managed entry mappings Bug 659456 - Incorrect usage of ber_printf() in winsync code Bug 641944 - Don't normalize non-DN RDN values Bug 658312 - Invalid free in Managed Entry plug-in Bug 661792 - Valid managed entry config rejected Bug 588791 - Allow anonymous rootDSE access only Bug 606439 - Creating server instance with LDAPI takes too long Bug 632670 - Chain-on-update logs managed-entries-plugin errors Bug 621008 - parsing purge RUV from changelog at startup fails Bug 663191 - Don't use $USER in DSCreate.pm Bug 663597 - Memory leaks in normalization code Bug 659131 - Incorrect RDN values added with multi-valued RDN Bug 661102 - Rename of managed entries not handled correctly Bug 193297 - Call pre-bind plug-ins for all SASL bind steps Bug 201652 - LDAPv2 bind with expired password doesn't unbind correctly Bug 470576 - Migration could do addition checks before commiting actions Bug 481195 - Missing op type in log when password change required Bug 509897 - Validate dnaScope to ensure it is a legal DN Bug 505722 - Allow ntGroup to have mail attribute present Bug 543633 - replication problems if supplier is killed under update load Bug 671033 - range sharing between server breaks with SASL/GSSAPI auth Bug 527912 - setup-ds.pl appears to hang when DNS is unreachable Bug 252249 - Add pkg-config file for plug-in developers Bug 670616 - Allow SSF to be set for local (ldapi) connections Bug 668862 - init scripts return wrong error code Bug 674430 - Improve error messages for attribute uniqueness Bug 675853 - dirsrv crash segfault in need_new_pw() Bug 678646 - Ignore tombstone operations in managed entry plug-in Bug 671199 - Don't allow other to write to rundir Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH Bug 674852 - crash in ldap-agent when using OpenLDAP Bug 681345 - setup-ds.pl should set SuiteSpotGroup automatically Bug 680558 - Winsync plugin fails to restrain itself to the configured subtree Bug 504803 - Allow maxlogsize to be set if logmaxdiskspace is -1 Bug 687974 - (cov#10715) Fix Coverity uninitialized variables issues Bug 688341 - (cov#10709) Fix Coverity code maintainability issues Bug 688341 - (cov#10708) Fix Coverity code maintainability issues Bug 688341 - (cov#10706,10707) Fix Coverity code maintainability issues Bug 688341 - (cov#10704,10705) Fix Coverity code maintainability issues Bug 688341 - (cov#10703) Fix Coverity code maintainability issues Bug 688341 - (cov#10702) Fix Coverity code maintainability issues Bug 688341 - (cov#10709) Fix Coverity code maintainability issues Bug 689537 - (cov#10699) Fix Coverity NULL pointer dereferences Bug 689537 - (cov#10610) Fix Coverity NULL pointer dereferences Bug 689537 - (cov#10608) Fix Coverity NULL pointer dereferences Bug 689952 - (cov#10581) Incorrect bit check in replication connection code Bug 690526 - (cov#10734) Double free in dse_add() Bug 690649 - (cov#10731) Use of free'd pointer in indexing code Bug 690882 - (cov#10571) Incorrect sizeof use in uuid code Bug 690882 - (cov#10636,10637) Useless comparison in attrcrypt Bug 690882 - (cov#10703) Incorrect sizeof use in vattr code Bug 690882 - (cov#10572,10710) Incorrect sizeof use in uuid code Bug 691574 - (cov#10579) Check return value of ber_scanf() in sort code Bug 691574 - (cov#10577) Check return types when adding RDN CSNs Bug 691574 - (cov#10573) check return value in GER code Bug 691574 - (cov#10575) Check return value of ldap_get_option Bug 691574 - (cov#10573) Fix syntax error Bug 693868 - Add managed entry config during in-place upgrade Add Auto Membership Plug-in Bug 698428 - Make auto membership use Slapi_DN for DN comparisons Bug 695779 - windows sync can lose old values when a new value is added Bug 700557 - Linked attrs callbacks access free'd pointers after close Bug 700557 - Leak at shutdown in DNA plug-in Bug 703304 - Auto membership alternate config area should override default area Bug 703304 - Auto membership alternate config area should override default area Bug 703530 - Allow Managed Entry config to be relocated Bug 697961 - memberOf needs to be triggered by internal operations Bug 710377 - Import with chain-on-update crashes ns-slapd Split automember regex rules into separate entries Bug 713209 - Update sudo schema Bug 691313 - Need TLS/SSL error messages in repl status and errors log Bug 723937 - Slapi_Counter API broken on 32-bit F15 Bug 725743 - Make memberOf use PRMonitor for it's operation lock Bug 729717 - Fatal error messages when syncing deletes from AD Bug 728510 - Run dirsync after sending updates to AD Bug 730387 - Add slapi_rwlock API and use POSIX rwlocks Bug 611438 - Add Account Usability Control support Bug 728592 - Allow ns-slapd to start with an invalid server cert Bug 732541 - Ignore error 32 when adding automember config Bug 722292 - Entries in DS are not updated properly when using WinSync API Bug 722292 - (cov#11030) Leak of mapped_sdn in winsync rename code Bug 735114 - renaming a managed entry does not update mepmanagedby Bug 739172 - Allow separate fractional attrs for incremental and total protocols Bug 743966 - Compiler warnings in account usability plugin Bug 744946 - (cov#11046) NULL dereference in IDL code Noriko Hosoi (286): 544089 - Referential Integrity Plugin does not take into account the attribute 557224 - subtree rename breaks the referential integrity plug-in 247413 - Incorrect error on multiple identical value add 559016 - Attempting to rename suffix returns inappropriate errors 555577 - Syntax validation fails for "ou=NetscapeRoot" tree Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree 560827 - Admin Server templates: DistinguishName validation fails 548535 - memory leak in attrcrypt 563365 - Error handling problems in the backend functions 565664 - Incorrect parameter for CACHE_RETURN() 565987 - redhat-ds-base fails to build due to undefined struct 527848 - make sure db upgrade to 4.7 and later works correctly 539618 - Replication bulk import reports Invalid read/write 567370 - dncache: assertion failure in id2entry_delete 548115 - memory leak in schema reload 555970 - missing read lock in the combination of cos and nsview 539618 - Replication bulk import reports Invalid read/write 570667 - MMR: simultaneous total updates on the masters cause Merge branch '547503' Revert "Merge branch '547503'" Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external 199923 - subtree search fails to find items under a db 570107 - The import of LDIFs with base-64 encoded DNs fails, 572649 - DS8.2 crashes on RHEL 4 (corresponding to bob, ber_2 test case) 573060 - DN normalizer: ESC HEX HEX is not normalized ( 573896 - initializing subtree with invalid syntax crashes ns-slapd 515805 - Stop "initialize Database" crashes the server 548533 - memory leak in Repl_5_Inc_Protocol_new Fixing a syntax error Update to New DN Format 585905 - ACL with targattrfilters error crashes the server 574167 - An escaped space at the end of the RDN value is not 590931 - rhds81 import - hardcoded pages_limit for nsslapd-import-cache-autosize 591336 - Implementing upgrade DN format tool 593453 - Creating password policy with ns-newpolicy.pl on Replicated 593110 - backup-restore does not ALWAYS work 593899 - adding specific ACI causes very large mem allocate request 588867 - entryusn plugin fails on solaris 593899 - adding specific ACI causes very large mem allocate request 595893 - Base DN in SASL mapping is not normalized 511112 - Password history limited to 25 values 597375 - Deleting LDBM database causes backup/restore problem 574101 - MODRDN request never returns - possible deadlock 606920 - anonymous resource limit - nstimelimit - 605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl 578296 - Attribute type entrydn needs to be added when subtree 609256 - Selinux: pwdhash fails if called via Admin Server CGI 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 616608 - SIGBUS in RDN index reads on platforms with strict alignments 619595 - Upgrading sub suffix under non-normalized suffix disappears 513166 - Simple Paged result doesn't provide the server's estimate 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6 Bug 194531 - db2bak is too noisy Bug 622628 - fix coverity Defect Type: Integer handling issues Bug 622628 - fix coverity Defect Type: Integer handling issues Bug 622628 - fix coverity Defect Type: Integer handling issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 623118 - Simplepaged results going in infinite loop Bug 614511 - fix coverity Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 619122 - fix coverity Defect Type: Resource leaks issues CID 11975 - 12051 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverity Defect Type: Resource leaks issues CID 12052 - 12093 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 Bug 616500 - fix coverity Defect Type: Resource leaks issues Bug 623507 - fix coverity Defect Type: Incorrect expression issues Bug 623507 - fix coverity Defect Type: Incorrect expression issues Bug 613056 - fix coverify Defect Type: Null pointer dereferences Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Removed redundant code in agmt_new_from_entry Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 628300 - DN is not normalized in dn/entry cache when an entry is added, entrydn is not present in search results Bug 531642 - EntryUSN: RFE: a configuration option to make entryusn "global" Bug 627738 - The cn=monitor statistics entries for the dnentry cache do not change or change very rarely DN normalizer should check the invalid type Bug 627738 - The cn=monitor statistics entries for the dnentry cache Bug 629710 - escape_string does not check '\<HEX><HEX>' agmtlist_shutdown (repl5_agmtlist.c) had an illegal access defect. Bug 633168 - Share backend dbEnv with the replication changelog Bug 633168 - Share backend dbEnv with the replication changelog Bug 631862 - crash - delete entries not in cache + referint Bug 625014 - SubTree Renames: ModRDN operation fails and the server hangs if the entry is moved to "under" the same DN. Bug 558099 - Enhancement request: Log more information about the search result being a paged one Bug 635987 - Incorrect sub scope search result with Bug 606920 - anonymous resource limit- nstimelimit - Bug 635987 - Incorrect sub scope search result with ACL containing ldap:///self Bug 639289 - Adding a new CN entry with UpperCase UTF-8 Character Bug 640027 - Naming attribute with a special char sequence parsing bug Bug 640854 - changelog db: _cl5WriteOperation: failed to Bug 637852 - sasl_io_start_packet: failed - read only 3 bytes Bug 586966 - Sample update script has syntax errors Bug 586973 - Sample update ldif points to non-existent directory Bug 602456 - Allow to add any cn=config attributes; Bug 244229 - targetattr not verified against schema when setting an aci Bug 643532 - Incorrect DNs sometimes returned on searches Bug 592397 - Upgrade tool dn2rdn: it does not clean up Bug 645061 - Upgrade: 06inetorgperson.ldif and 05rfc4524.ldif Bug 629681 - Retro Changelog trimming does not behave as expected Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs Bug 638773 - permissions too loose on pid and lock files Bug 491733 - dbtest crashes Bug 329751 - "nested" filtered roles searches candidates more Bug 567282 - server can not abandon searchRequest of "simple paged results" Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot Bug 651571 - When attrcrypt is on, entrydn is stored in the backend db Bug 661918 - 389-ds MMR plugin's changelogdb path logic is incorrect Bug 182507 - clear-password mod from replica is discarded before changelogged Bug 602456 - Allow to add any cn=config attributes; Bug 489379 - passwordExpirationTime in entry being added Bug 663484 - Entry usn plugin fails to properly tag entries on initialization Bug 664563 - GER: ger for non-present entry is not correct Bug 653007 - db2ldif export of clear text passwords lacks storage scheme Bug 667488 - Cannot recreate numsubordinates index with db2index Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 615100 - log rotationinfo always recreated at startup, Bug 624442 - MMR: duplicate replica ID Bug 669205 - db2bak: backed up changelog should include RUVs Bug 616850 - ldapmodify failed to reject the replace operation Bug 627993 - Inconsistent storage of password expiry times Bug 627993 - Inconsistent storage of password expiry times dn2rdn should respect the DB version info Bug 646381 - Faulty password for nsmultiplexorcredentials does not give any error message in logs Bug 624547 - attrcrypt should query the given slot/token for Bug 668619 - slapd stops responding Bug 151705 - Need to update Console Cipher Preferences with new ciphers Bug 615052 - intrinsics and 64-bit atomics code fails to compile Bug 616213 - insufficient stack size for HP-UX on PA-RISC Bug 675265 - preventryusn gets added to entries on a failed delete Bug 604881 - admin server log files have incorrect permissions/ownerships Bug 676053 - export task followed by import task causes cache assertion Bug 676053 - export task followed by import task causes cache assertion Bug 676053 - export task followed by import task causes cache assertion Bug 450016 - RFE- Console display values in KB/MB/GB Cancelling commit aef19508c4f618285116d2068655183658f564d9 Bug 625424 - repl-monitor.pl doesn't work in hub node Bug 679978 - modifying attr value crashes the server, which is supposed to Bug 681015 - RFE: allow fine grained password policy duration attributes in days, hours, minutes, as well Bug 668909 - Can't modify replication agreement in some cases Bug 684996 - Exported tombstone cannot be imported correctly Bug 681015 - RFE: allow fine grained password policy duration attributes in days, hours, minutes, as well Bug 689866 - ns-newpwpolicy.pl needs to use the new DN format Bug 690955 - Mrclone fails due to the replica generation id mismatch Bug 696407 - If an entry with a mixed case RDN is turned to be Bug 697027 - 1 - minor memory leaks found by Valgrind + TET Bug 697027 - 2 - minor memory leaks found by Valgrind + TET Bug 697027 - 3 - minor memory leaks found by Valgrind + TET Bug 697027 - 4 - minor memory leaks found by Valgrind + TET Bug 697027 - 5 - minor memory leaks found by Valgrind + TET Bug 697027 - 6 - minor memory leaks found by Valgrind + TET Bug 697027 - 7 - minor memory leaks found by Valgrind + TET Bug 697027 - 8 - minor memory leaks found by Valgrind + TET Bug 697027 - 9 - minor memory leaks found by Valgrind + TET Bug 697027 - 10 - minor memory leaks found by Valgrind + TET Bug 697027 - 11 - minor memory leaks found by Valgrind + TET Bug 697027 - 12 - minor memory leaks found by Valgrind + TET Bug 697027 - 13 - minor memory leaks found by Valgrind + TET Bug 697027 - 14 - minor memory leaks found by Valgrind + TET Bug 697027 - 15 - minor memory leaks found by Valgrind + TET Bug 697027 - 16 - minor memory leaks found by Valgrind + TET Bug 697027 - 3 - minor memory leaks found by Valgrind + TET Bug 697027 - 3 - minor memory leaks found by Valgrind + TET Bug 700215 - ldclt core dumps Bug 668619 - slapd stops responding Bug 709826 - Memory leak: when extra referrals configured Bug 706179 - DS can not restart after create a new objectClass has entryusn attribute Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 711679 - unresponsive LDAP service when deleting vlv on replica Bug 711679 - unresponsive LDAP service when deleting vlv on replica Bug 718303 - Intensive updates on masters could break the consumer's cache Merge branch '718303' Bug 719069 - clean up compiler warnings in 389-ds-base 1.2.9 Bug 712855 - Directory Server 8.2 logs "Netscape Portable Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 732153 - subtree and user account lockout policies implemented? Introducing an environment variable USE_VALGRIND to clean up the entry cache and dn cache on exit. Bug 744945 - nsslapd-counters attribute value cannot be set to "off" Keep unhashed password psuedo-attribute in the adding entry Reduce the number of DN normalization Bug 745259 - Incorrect entryUSN index under high load Bug 750622 - Fix Coverity (11104) Resource leak: Bug 750624 - Fix Coverity (11053) Explicit null dereferenced: Bug 750625 - Fix Coverity (11066) Unused pointer value Bug 750625 - Fix Coverity (11065) Uninitialized pointer read Bug 750625 - Fix Coverity (11064) Dereference before null check Bug 750625 - Fix Coverity (11061) Resource leak Bug 750625 - Fix Coverity (11060) Dereference null return value Bug 750625 - Fix Coverity (11058, 11059) Dereference null return value Bug 750625 - Fix Coverity (11057) Dereference null return value Bug 750625 - Fix Coverity (11055) Explicit null dereferenced Bug 750625 - Fix Coverity (11054) Dereference after null check Bug 750625 - Fix Coverity (11117) Uninitialized pointer read Bug 750625 - Fix Coverity (11116) Uninitialized pointer read Bug 750625 - Fix Coverity (11114, 11115) Uninitialized value use Bug 750625 - Fix Coverity (11113) Uninitialized pointer read Bug 750625 - Fix Coverity (11112) Uninitialized pointer read Bug 750625 - Fix Coverity (11109, 11110, 11111) Uninitialized pointer read Bug 750625 - Fix Coverity (11108) Sizeof not portable Bug 750625 - Fix Coverity (11107) Dereference before null check Bug 750625 - Fix Coverity (11096) Explicit null dereferenced Bug 750625 - Fix Coverity (11095) Explicit null dereferenced Bug 750625 - Fix Coverity (11094) Dereference after null check Bug 750625 - Fix Coverity (11091) Unchecked return value Bug 750625 - Fix Coverity (11055-2) Explicit null dereferenced Bug 750625 - Fix Coverity (11062) Resource leak Bug 750625 - Fix Coverity (11066-2) Unused pointer value Bug 750625 - Fix Coverity (12195) Dereference after null check Bug 750625 - Fix Coverity (12196) Dereference before null check Bug 750625 - Fix Coverity (11066-3) Unused pointer value Rich Megginson (251): Net::LDAP password modify extop breaks; msgid in response is 0xFF Clean up assert for entrydn Bug 543080 - Bitwise plugin fails to return the exact matched entries for Bitwise search filter Bug 537466 - nsslapd-distribution-plugin should not require plugin name to begin with "lib" bump version to 1.2.6.a2 Do not use syntax plugins directly for filters, indexing wrap new style matching rule plugins for use in old style indexing code change extensible filter code to use new syntax function style mr funcs change syntax plugins to register required matching rule plugins crash looking up compat syntax; numeric string syntax using integer; make octet string ordering work correctly fix memory leak in attr replace when replacement fails fix dso linking issues found by fedora 13 linking problems linking with -z defs 389 DS segfaults on libsyntax-plugin.so - part 1 389 DS segfaults on libsyntax-plugin.so - part 2 389 DS segfaults on libsyntax-plugin.so - part 3 Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS Bug 568196 - Install DS8.2 on Solaris fails Bug 568196 - Install DS8.2 on Solaris fails - part 2 Bug 551198 - LDAPI: incorrect logging to access log bump version to 1.2.6.a3 fix various memory leaks Bug 551198 - LDAPI: incorrect logging to access log - part 2 Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external cleanup build warnings Bug 571514 - upgrade to 1.2.6 should upgrade 05rfc4523.ldif (cert schema) Bug 570905 - postalAddress syntax should allow empty lines (should allow $$) Add support for additional schema/matching rules included with 389 Bug 572677 - Memory leak in searches including GER control Bug 571677 - Busy replica on consumers when directly deleting a replication conflict Bug 576074 - search filters with parentheses fail Bug 567429 - slapd didn't close connection and get into CLOSE_WAIT state Bug 578167 - repl. of mod/replace deletes multi-valued attrs Bug 561575 - setup-ds-admin fails to supply nsds5ReplicaName when configuring via ConfigFile Bug 572162 - the string "|*" within a search filter on a non-indexed attribute returns all elements. Bug 576644 - segfault while multimaster replication (paired node won't find deleted entries) start of 1.2.6.a4 Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot Fix too few args for format warning in acllas Bug 586571 - DS Console shows escaped DNs Bug 591685 - Server instances Fail to Start on Solaris due to Library Path and pcre bump console version to 1.2.3 Repl Session API needs to check for NULL api before init Bug 593392 - setup-ds-admin.pl -k creates world readable file Bug 595874 - 99user.ldif getting overpopulated bump version to 1.2.6.a5 bump version to 1.2.6.rc1 bump version to 1.2.6.rc2 bump version to 1.2.6.rc3 Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll Bug 603942 - null deref in _ger_parse_control() for subjectdn bump version to 1.2.6.rc4 Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 602530 - coverity: op_shared_modify: compare pre, post and original entries before freeing them Bug 602531 - coverity: op_shared_delete: compare preop entry and GLUE_PARENT_ENTRY before freeing them Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 610177 - fix coverity Defect Type: Uninitialized variables issues Bug 610276 - fix coverity Defect Type: API usage errors issues Bug 611850 - fix coverity Defect Type: Error handling issues Bug 614242 - C99/ANSI C++ related compile errors on HP-UX Bug 547503 - replication broken again, with 389 MMR replication and TCP errors Bug 617013 - repl-monitor.pl use cpu upto 90% fix build failures due to libtool problems Bug 617629 - Missing aliases in new schema files Bug 617862 - Replication: Unable to delete tombstone errors bump version to 1.2.7.a1 Bug 610281 - fix coverity Defect Type: Control flow issues - daemon.c:write_function() Bug 610281 - fix coverity Defect Type: Control flow issues - last repl init status postalAddress syntax does not accept empty values ger should support both "dn" and "distinguishedName" openldap - ldap_url_parse_ext is not part of the public api fix memleak in ldbm_config_read_instance_entries Add -x option to ldap tools when using openldap openldap - add support for missing controls, add ldif api, fix NSS usage port client tools to use openldap API use the mozldap versions of the proxy auth control create function document slapi wrappers for openldap/mozldap functions that differ fix some compiler warnings use strcasecmp with ptype and type->bv_val ber_printf 'o' cannot handle NULL bv_val fix the url_parse logic when looking for a missing suffix DN openldap ldapsearch uses -LLL to suppress # version: N add ldaptool_opts for the non BUNDLE case in Makefile.am openldap ldapsearch returns empty line at end of LDIF output have to use LDAP_OPT_X_TLS_NEVER to defeat cert hostname checking openldap_read_function needs to set EWOULDBLOCK if the buffer is empty do not terminate unwrapped LDIF line with another newline slapi_ldap_url_parse must handle multiple host:port in url convert mozldap host list to openldap uri list move the out pointer back if continuation lines were removed check src < *out only; only check for \nspace if src < *out - 2 use slapi_ldap_url_parse in the acl code do not un-null-terminate normalized DN until new url is constructed implement slapi_ldap_explode_dn and slapi_ldap_explode_rdn use slapi_pblock_set to set the ldap result code for the be postop plugins pass the string copy to slapi_dn_normalize_original bug 614511 - fix coverity null reference - revert macro aci $dn logic fix compiler warnings - unused vars/funcs, invalid casts use slapi_mods_init_passin/get_ldapmods_passout if modifying the smods Have to explicitly set protocol version to 3 Only check modrdn ops for backend/suffix correctness if not the default backend Bug 634561 - Server crushes when using Windows Sync Agreement openldap ber_init will assert if the bv->bv_val is NULL add the account policy plugin and related server code, schema, and config fix pblock memory leak do not register pre/post op plugins if disabled add support for global inactivity limit fix typos in Makefile.am, acctpolicy schema bump version to 1.2.7.a2 remove extra format argument; use %lu for size_t printf format Bug 644013 - uniqueness plugin segfault bug bump version to 1.2.7.a3 bump to 1.2.7.a4 bump version to 1.2.7.a5 put replication config entries in separate file bump version to 1.2.7.a6 bump version to 1.2.7.1 bump version to 1.2.7.2 bump version to 1.2.7.3 bump version to 1.2.7.4 Bug 515329 - Multiple mods in one operation can result in an inconsistent replica bump version to 1.2.8.a1 Bug 642046 - Segfault when using SASL/GSSAPI multimaster replication, possible krb5_creds doublefree Bug 624485 - setup dsktune check step should default to "yes" if no problems found Bug 622907 - support piped passwords to perl-based maintenance commands Bug 624485 - setup dsktune check step should default to "yes" if no problems found Bug 576534 - Password displayed on console when entered in command-line utilities Bug 667935 - DS pipe log script's logregex.py plugin is not redirecting the log output to the text file bump version to 1.2.8.a2 Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted Bug 676689 - crash while adding a new user to be synced to windows Bug 675113 - ns-slapd core dump in windows_tot_run if oneway sync is used Bug 677440 - clean up compiler warnings in 389-ds-base 1.2.8 Bug 677774 - DS fails to start after reboot Bug 666076 - dirsrv crash (1.2.7.5) with multiple simple paged result searches Bug 675320 - empty modify operation with repl on or lastmod off will crash server bump version to 1.2.9.a1 - console version to 1.2.4 Bug 677705 - ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t". Bug 676655 - winsync stops working after server restart Bug 680555 - ns-slapd segfaults if I have more than 100 DBs Bug 514190 - setup-ds-admin.pl --debug does not log to file Bug 518890 - setup-ds-admin.pl - improve hostname validation Bug 644784 - Memory leak in "testbind.c" plugin Bug 683250 - slapd crashing when traffic replayed Bug 690584 - #10691 ldbm_back_init() - fix coverity resource leak issues Bug 690584 - #10690 #10689 attrcrypt_get_ssl_cert_name() - fix coverity resource leak issues Bug 690584 - #10688 - dblayer_make_env - fix coverity resource leak issues Bug 690584 - #10669 #10668 cl5ImportLDIF - fix coverity resource leak issues Bug 690584 - #10658 linked_attrs_pre_op - fix coverity resource leak issues Bug 690584 - #10655 acllas__handle_group_entry - fix coverity resource leak issues Bug 690584 - #10654 #10653 str2entry_dupcheck - fix coverity resource leak issues Bug 690584 - #10652 #10651 #10650 #10649 #10648 #10647 send_specific_attrs send_all_attrs - fix coverity resource leak issues Bug 690584 - #10643 hash_rootpw - fix coverity resource leak issues Bug 690584 - #10641 reslimit_bv2int - fix coverity resource leak issues Bug 691422 - sdt_destroy - fix coverity control flow issues Bug 691422 - ldbm_back_upgradedb - fix coverity control flow issues Bug 691422 - csnplFree - fix coverity control flow issues Bug 691422 - SetUnicodeStringFromUTF_8 - fix coverity control flow issues Bug 691422 - cl5DeleteRUV - fix coverity control flow issues Bug 691422 - acl_read_access_allowed_on_entry - fix coverity control flow issues Bug 691422 - search_internal_callback_pb - fix coverity control flow issues Bug 691422 - cl5WriteRUV - fix coverity control flow issues Bug 691422 - windows_replay_update - fix coverity control flow issues Bug 690584 - #10691 ldbm_back_init() - fix coverity resource leak issues Bug 690584 - #10652 #10651 #10650 #10649 #10648 #10647 send_specific_attrs send_all_attrs - fix coverity resource leak issues Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted Bug 692937 - Replica install fails after step for "enable GSSAPI for replication" Bug 692331 - Segfault on index update during full replication push on 1.2.7.5 Bug 693451 - cannot use localized matching rules Bug 693455 - nsMatchingRule does not work with multiple values Bug 693503 - matching rules do not inherit from superior attribute type Bug 693466 - Unable to change schema online Bug 692991 - rhds82 - windows_tot_run: failed to obtain data to send to the consumer; LDAP error - -1 Bug 693473 - rhds82 rfe - windows_tot_run to log Sizelimit exceeded instead of LDAP error - -1 Bug 693962 - Full replica push loses some entries with multi-valued RDNs Bug 694336 - Group sync hangs Windows initial Sync Bug 700145 - userpasswd not replicating Bug 703990 - Support upgrade from Red Hat Directory Server bump console version to 1.2.5 Bug 703990 - Support upgrade from Red Hat Directory Server Bug 703990 - Support upgrade from Red Hat Directory Server Bug 707015 - Cannot disable SSLv3 and use TLS only bump version to 1.2.9.a2 Bug 707384 - only allow FIPS approved cipher suites in FIPS mode Bug 711906 - ns-slapd segfaults using suffix referrals Bug 706209 - LEGAL: RHEL6.1 License issue for 389-ds-base package Bug 703703 - setup-ds-admin.pl asks for legal agreement to a non-existant file Bug 711679 - unresponsive LDAP service when deleting vlv on replica bump console version to 1.2.6 Bug 697694 - rhds82 - incr update state stop_fatal_error "requires administrator action", with extop_result: 9 Bug 716980 - winsync uses old AD entry if new one not found add support for ldif files with changetype: add writing Inf file shows SchemaFile = ARRAY(0xhexnum) look for separate openldap ldif library bump version to 1.2.9.a3 Bug 709468 - RSA Authentication Server timeouts when using simple paged results on RHDS 8.2. Bug 720059 - RDN with % can cause crashes or missing entries bump version to 1.2.9.0 Bug 725542 - Instance upgrade fails when upgrading 389-ds-base package Bug 725953 - Winsync: DS entries fail to sync to AD, if the User's CN entry contains a comma Bug 723937 - replication failing on RUV errors bump version to 1.2.9.1 Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error bump version to 1.2.9.2 Bug 727511 - ldclt SSL search requests are failing with "illegal error numbe bump version to 1.2.9.3 Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error bump version to 1.2.9.4 Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error bump version to 1.2.9.5 Bug 729378 - delete user subtree container in AD + modify password in DS == DS crash Bug 723937 - replication failing on RUV errors Bug 729369 - upgrade DB to upgrade from entrydn to entryrdn format is not working. make sure the DBVERSION file ends in a newline bump version to 1.2.10.a1 Bug 633803 - passwordisglobalpolicy attribute brakes TLS chaining Bug 733103 - large targetattr list with syntax errors cause server to crash or hang Bug 703990 - cross-platform - Support upgrade from Red Hat Directory Server Bug 735121 - simple paged search + ip/dns based ACI hangs server Bug 695736 - Providing native systemd file for upcoming F15 Feature Systemd Bug 590826 - Reloading database from ldif causes changelog to emit "data no longer matches" errors Bug 736712 - Modifying ruv entry deadlocks server Add support for pre/post db transaction plugins Make all backend operations transaction aware Bug 741744 - MOD operations with chained delete/add get back error 53 on backend config Bug 742324 - allow nsslapd-idlistscanlimit to be set dynamically and per-user Bug 741744 - part2 - MOD operations with chained delete/add get back error 53 on backend config Bug 740942 - allow resource limits to be set for paged searches independently of limits for other searches/operations bump version to 1.2.10.a2 bump version to 1.2.10.a3 fix transaction support in ldbm_delete bump version to 1.2.10.a4 set the ENTRY_POST_OP for modrdn betxnpostoperation plugins pass the plugin config entry to the plugin init function make memberof transaction aware and able to be a betxnpostoperation plugin Bug 741744 - part3 - MOD operations with chained delete/add get back error 53 bump version to 1.2.10.a5 Change referential integrity to be a betxnpostoperation plugin Use new PLUGIN_CONFIG_ENTRY feature to allow switching between txn and regular Bug 748575 - rhds81 modrn operation and 100% cpu use in replication Bug 748575 - part 2 - rhds81 modrdn operation and 100% cpu use in replication Bug 751495 - 'setup-ds.pl -u' fails with undefined routine 'updateSystemD' root (1): Bug 480787 - Autoconf parameter --with and --without --- .gitignore | 1 Makefile.am | 232 Makefile.in | 5170 - README | 11 VERSION.sh | 7 aclocal.m4 | 6996 -- compile | 21 config.guess | 302 config.h.in | 22 config.sub | 232 configure |41932 +++++------- configure.ac | 176 depcomp | 172 dirsrv.pc.in | 7 include/base/dbtbase.h | 2 include/base/lexer.h | 126 include/i18n.h | 115 include/ldaputil/ldaputil.h | 10 include/libaccess/aclerror.h | 1 include/libaccess/aclproto.h | 15 include/libaccess/aclstruct.h | 2 include/libaccess/dbtlibaccess.h | 3 include/public/nsacl/aclapi.h | 7 install-sh | 517 ldap/admin/src/base-initconfig.in | 44 ldap/admin/src/initconfig.in | 37 ldap/admin/src/scripts/10cleanupldapi.pl | 23 ldap/admin/src/scripts/10fixrundir.pl | 11 ldap/admin/src/scripts/50acctusabilityplugin.ldif | 21 ldap/admin/src/scripts/50automemberplugin.ldif | 15 ldap/admin/src/scripts/50fixNsState.pl | 240 ldap/admin/src/scripts/50managedentriesplugin.ldif | 16 ldap/admin/src/scripts/50refintprecedence.ldif | 4 ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5 ldap/admin/src/scripts/60upgradeschemafiles.pl | 2 ldap/admin/src/scripts/70upgradefromldif.pl | 112 ldap/admin/src/scripts/80upgradednformat.pl | 206 ldap/admin/src/scripts/81changelog.pl | 29 ldap/admin/src/scripts/90subtreerename.pl | 6 ldap/admin/src/scripts/DSCreate.pm.in | 312 ldap/admin/src/scripts/DSDialogs.pm | 4 ldap/admin/src/scripts/DSMigration.pm.in | 47 ldap/admin/src/scripts/DSUpdate.pm.in | 22 ldap/admin/src/scripts/DSUtil.pm.in | 219 ldap/admin/src/scripts/DialogManager.pm | 241 ldap/admin/src/scripts/DialogManager.pm.in | 241 ldap/admin/src/scripts/Inf.pm | 67 ldap/admin/src/scripts/Migration.pm.in | 20 ldap/admin/src/scripts/Setup.pm.in | 20 ldap/admin/src/scripts/SetupDialogs.pm.in | 31 ldap/admin/src/scripts/SetupLog.pm | 8 ldap/admin/src/scripts/ds-logpipe.py | 221 ldap/admin/src/scripts/exampleupdate.ldif | 2 ldap/admin/src/scripts/exampleupdate.sh | 10 ldap/admin/src/scripts/logregex.py | 16 ldap/admin/src/scripts/migrate-ds.pl.in | 13 ldap/admin/src/scripts/remove-ds.pl.in | 28 ldap/admin/src/scripts/repl-monitor.pl.in | 78 ldap/admin/src/scripts/restart-dirsrv.in | 25 ldap/admin/src/scripts/setup-ds.pl.in | 7 ldap/admin/src/scripts/setup-ds.res.in | 32 ldap/admin/src/scripts/start-dirsrv.in | 43 ldap/admin/src/scripts/stop-dirsrv.in | 27 ldap/admin/src/scripts/template-bak2db.in | 49 ldap/admin/src/scripts/template-bak2db.pl.in | 29 ldap/admin/src/scripts/template-db2bak.in | 53 ldap/admin/src/scripts/template-db2bak.pl.in | 29 ldap/admin/src/scripts/template-db2index.in | 14 ldap/admin/src/scripts/template-db2index.pl.in | 33 ldap/admin/src/scripts/template-db2ldif.in | 15 ldap/admin/src/scripts/template-db2ldif.pl.in | 29 ldap/admin/src/scripts/template-dbverify.in | 15 ldap/admin/src/scripts/template-dn2rdn.in | 25 ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 29 ldap/admin/src/scripts/template-fixup-memberof.pl.in | 29 ldap/admin/src/scripts/template-ldif2db.in | 15 ldap/admin/src/scripts/template-ldif2db.pl.in | 29 ldap/admin/src/scripts/template-ldif2ldap.in | 19 ldap/admin/src/scripts/template-monitor.in | 19 ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 33 ldap/admin/src/scripts/template-ns-activate.pl.in | 33 ldap/admin/src/scripts/template-ns-inactivate.pl.in | 33 ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 47 ldap/admin/src/scripts/template-restart-slapd.in | 2 ldap/admin/src/scripts/template-restoreconfig.in | 15 ldap/admin/src/scripts/template-saveconfig.in | 15 ldap/admin/src/scripts/template-schema-reload.pl.in | 29 ldap/admin/src/scripts/template-start-slapd.in | 3 ldap/admin/src/scripts/template-stop-slapd.in | 2 ldap/admin/src/scripts/template-suffix2instance.in | 15 ldap/admin/src/scripts/template-syntax-validate.pl.in | 29 ldap/admin/src/scripts/template-upgradedb.in | 15 ldap/admin/src/scripts/template-upgradednformat.in | 63 ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 29 ldap/admin/src/scripts/template-verify-db.pl.in | 19 ldap/admin/src/scripts/template-vlvindex.in | 15 ldap/admin/src/slapd.inf.in | 2 ldap/admin/src/template-initconfig.in | 18 ldap/docs/LICENSE.txt | 132 ldap/docs/README.txt | 11 ldap/include/ldaplog.h | 32 ldap/ldif/50replication-plugins.ldif | 26 ldap/ldif/template-baseacis.ldif.in | 2 ldap/ldif/template-bitwise.ldif.in | 6 ldap/ldif/template-dse.ldif.in | 96 ldap/ldif/template-suffix-db.ldif.in | 1 ldap/schema/00core.ldif | 72 ldap/schema/01core389.ldif | 10 ldap/schema/02common.ldif | 12 ldap/schema/05rfc4523.ldif | 14 ldap/schema/05rfc4524.ldif | 30 ldap/schema/06inetorgperson.ldif | 5 ldap/schema/10automember-plugin.ldif | 123 ldap/schema/10mep-plugin.ldif | 104 ldap/schema/30ns-common.ldif | 4 ldap/schema/50ns-directory.ldif | 2 ldap/schema/60acctpolicy.ldif | 47 ldap/schema/60qmail.ldif | 4 ldap/schema/60sudo.ldif | 58 ldap/servers/plugins/acct_usability/acct_usability.c | 464 ldap/servers/plugins/acct_usability/acct_usability.h | 63 ldap/servers/plugins/acctpolicy/acct_config.c | 143 ldap/servers/plugins/acctpolicy/acct_init.c | 191 ldap/servers/plugins/acctpolicy/acct_plugin.c | 311 ldap/servers/plugins/acctpolicy/acct_util.c | 257 ldap/servers/plugins/acctpolicy/acctpolicy.h | 81 ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40 ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27 ldap/servers/plugins/acl/acl.c | 181 ldap/servers/plugins/acl/acl.h | 19 ldap/servers/plugins/acl/acl_ext.c | 37 ldap/servers/plugins/acl/aclanom.c | 13 ldap/servers/plugins/acl/acleffectiverights.c | 114 ldap/servers/plugins/acl/aclgroup.c | 19 ldap/servers/plugins/acl/acllas.c | 388 ldap/servers/plugins/acl/acllist.c | 69 ldap/servers/plugins/acl/aclparse.c | 610 ldap/servers/plugins/acl/aclplugin.c | 35 ldap/servers/plugins/acl/aclproxy.c | 232 ldap/servers/plugins/acl/aclutil.c | 110 ldap/servers/plugins/automember/automember.c | 1880 ldap/servers/plugins/automember/automember.h | 134 ldap/servers/plugins/bitwise/bitwise.c | 20 ldap/servers/plugins/chainingdb/cb.h | 8 ldap/servers/plugins/chainingdb/cb_add.c | 105 ldap/servers/plugins/chainingdb/cb_bind.c | 196 ldap/servers/plugins/chainingdb/cb_compare.c | 101 ldap/servers/plugins/chainingdb/cb_config.c | 37 ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 98 ldap/servers/plugins/chainingdb/cb_controls.c | 36 ldap/servers/plugins/chainingdb/cb_delete.c | 125 ldap/servers/plugins/chainingdb/cb_init.c | 6 ldap/servers/plugins/chainingdb/cb_instance.c | 325 ldap/servers/plugins/chainingdb/cb_modify.c | 133 ldap/servers/plugins/chainingdb/cb_modrdn.c | 174 ldap/servers/plugins/chainingdb/cb_monitor.c | 6 ldap/servers/plugins/chainingdb/cb_schema.c | 4 ldap/servers/plugins/chainingdb/cb_search.c | 219 ldap/servers/plugins/chainingdb/cb_utils.c | 15 ldap/servers/plugins/collation/collate.c | 24 ldap/servers/plugins/cos/cos_cache.c | 792 ldap/servers/plugins/deref/deref.c | 8 ldap/servers/plugins/dna/dna.c | 712 ldap/servers/plugins/http/http_impl.c | 81 ldap/servers/plugins/linkedattrs/fixup_task.c | 20 ldap/servers/plugins/linkedattrs/linked_attrs.c | 145 ldap/servers/plugins/linkedattrs/linked_attrs.h | 2 ldap/servers/plugins/memberof/memberof.c | 800 ldap/servers/plugins/memberof/memberof.h | 7 ldap/servers/plugins/memberof/memberof_config.c | 242 ldap/servers/plugins/mep/mep.c | 2572 ldap/servers/plugins/mep/mep.h | 129 ldap/servers/plugins/pam_passthru/pam_passthru.h | 2 ldap/servers/plugins/pam_passthru/pam_ptconfig.c | 2 ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 32 ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 9 ldap/servers/plugins/passthru/passthru.h | 4 ldap/servers/plugins/passthru/ptbind.c | 6 ldap/servers/plugins/passthru/ptconfig.c | 43 ldap/servers/plugins/passthru/ptconn.c | 8 ldap/servers/plugins/passthru/ptpreop.c | 17 ldap/servers/plugins/pwdstorage/smd5_pwd.c | 9 ldap/servers/plugins/referint/referint.c | 761 ldap/servers/plugins/replication/cl4_api.c | 2 ldap/servers/plugins/replication/cl5.h | 1 ldap/servers/plugins/replication/cl5_api.c | 2360 ldap/servers/plugins/replication/cl5_api.h | 111 ldap/servers/plugins/replication/cl5_clcache.c | 55 ldap/servers/plugins/replication/cl5_clcache.h | 2 ldap/servers/plugins/replication/cl5_config.c | 247 ldap/servers/plugins/replication/cl5_init.c | 2 ldap/servers/plugins/replication/cl5_test.c | 2 ldap/servers/plugins/replication/cl_crypt.c | 203 ldap/servers/plugins/replication/cl_crypt.h | 53 ldap/servers/plugins/replication/csnpl.c | 38 ldap/servers/plugins/replication/legacy_consumer.c | 31 ldap/servers/plugins/replication/repl-session-plugin.h | 119 ldap/servers/plugins/replication/repl.h | 2 ldap/servers/plugins/replication/repl5.h | 65 ldap/servers/plugins/replication/repl5_agmt.c | 292 ldap/servers/plugins/replication/repl5_agmtlist.c | 106 ldap/servers/plugins/replication/repl5_connection.c | 147 ldap/servers/plugins/replication/repl5_inc_protocol.c | 41 ldap/servers/plugins/replication/repl5_init.c | 49 ldap/servers/plugins/replication/repl5_mtnode_ext.c | 13 ldap/servers/plugins/replication/repl5_plugins.c | 181 ldap/servers/plugins/replication/repl5_prot_private.h | 4 ldap/servers/plugins/replication/repl5_protocol.c | 107 ldap/servers/plugins/replication/repl5_protocol_util.c | 509 ldap/servers/plugins/replication/repl5_replica.c | 244 ldap/servers/plugins/replication/repl5_replica_config.c | 365 ldap/servers/plugins/replication/repl5_replica_dnhash.c | 26 ldap/servers/plugins/replication/repl5_replica_hash.c | 30 ldap/servers/plugins/replication/repl5_ruv.c | 361 ldap/servers/plugins/replication/repl5_ruv.h | 18 ldap/servers/plugins/replication/repl5_tot_protocol.c | 32 ldap/servers/plugins/replication/repl5_total.c | 22 ldap/servers/plugins/replication/repl5_updatedn_list.c | 2 ldap/servers/plugins/replication/repl_bind.c | 6 ldap/servers/plugins/replication/repl_compare.c | 18 ldap/servers/plugins/replication/repl_connext.c | 2 ldap/servers/plugins/replication/repl_controls.c | 2 ldap/servers/plugins/replication/repl_extop.c | 291 ldap/servers/plugins/replication/repl_globals.c | 2 ldap/servers/plugins/replication/repl_init.c | 1 ldap/servers/plugins/replication/repl_objset.c | 9 ldap/servers/plugins/replication/repl_session_plugin.c | 188 ldap/servers/plugins/replication/repl_shared.h | 17 ldap/servers/plugins/replication/replutil.c | 107 ldap/servers/plugins/replication/test_repl_session_plugin.c | 335 ldap/servers/plugins/replication/urp.c | 106 ldap/servers/plugins/replication/urp.h | 2 ldap/servers/plugins/replication/urp_glue.c | 4 ldap/servers/plugins/replication/urp_tombstone.c | 6 ldap/servers/plugins/replication/windows_connection.c | 166 ldap/servers/plugins/replication/windows_inc_protocol.c | 55 ldap/servers/plugins/replication/windows_private.c | 128 ldap/servers/plugins/replication/windows_protocol_util.c | 677 ldap/servers/plugins/replication/windows_tot_protocol.c | 125 ldap/servers/plugins/replication/windowsrepl.h | 14 ldap/servers/plugins/replication/winsync-plugin.h | 2 ldap/servers/plugins/retrocl/retrocl.c | 3 ldap/servers/plugins/retrocl/retrocl.h | 2 ldap/servers/plugins/retrocl/retrocl_create.c | 13 ldap/servers/plugins/retrocl/retrocl_po.c | 19 ldap/servers/plugins/retrocl/retrocl_trim.c | 20 ldap/servers/plugins/rever/des.c | 72 ldap/servers/plugins/rever/rever.c | 8 ldap/servers/plugins/roles/roles_cache.c | 128 ldap/servers/plugins/schema_reload/schema_reload.c | 5 ldap/servers/plugins/shared/plugin-utils.h | 112 ldap/servers/plugins/shared/utils.c | 508 ldap/servers/plugins/statechange/statechange.c | 26 ldap/servers/plugins/syntaxes/bin.c | 142 ldap/servers/plugins/syntaxes/bitstring.c | 36 ldap/servers/plugins/syntaxes/ces.c | 140 ldap/servers/plugins/syntaxes/cis.c | 288 ldap/servers/plugins/syntaxes/dn.c | 42 ldap/servers/plugins/syntaxes/int.c | 64 ldap/servers/plugins/syntaxes/nameoptuid.c | 41 ldap/servers/plugins/syntaxes/numericstring.c | 118 ldap/servers/plugins/syntaxes/string.c | 198 ldap/servers/plugins/syntaxes/syntax.h | 59 ldap/servers/plugins/syntaxes/syntax_common.c | 117 ldap/servers/plugins/syntaxes/tel.c | 62 ldap/servers/plugins/syntaxes/validate.c | 17 ldap/servers/plugins/syntaxes/value.c | 116 ldap/servers/plugins/uiduniq/7bit.c | 48 ldap/servers/plugins/uiduniq/plugin-utils.h | 96 ldap/servers/plugins/uiduniq/uid.c | 317 ldap/servers/plugins/uiduniq/utils.c | 249 ldap/servers/plugins/usn/usn.c | 112 ldap/servers/plugins/usn/usn.h | 2 ldap/servers/plugins/usn/usn_cleanup.c | 13 ldap/servers/plugins/views/views.c | 27 ldap/servers/slapd/abandon.c | 7 ldap/servers/slapd/add.c | 173 ldap/servers/slapd/agtmmap.c | 56 ldap/servers/slapd/attr.c | 80 ldap/servers/slapd/attrlist.c | 7 ldap/servers/slapd/attrsyntax.c | 143 ldap/servers/slapd/auditlog.c | 69 ldap/servers/slapd/auth.c | 59 ldap/servers/slapd/back-ldbm/ancestorid.c | 104 ldap/servers/slapd/back-ldbm/archive.c | 91 ldap/servers/slapd/back-ldbm/back-ldbm.h | 81 ldap/servers/slapd/back-ldbm/backentry.c | 2 ldap/servers/slapd/back-ldbm/cache.c | 83 ldap/servers/slapd/back-ldbm/dbhelp.c | 12 ldap/servers/slapd/back-ldbm/dblayer.c | 1614 ldap/servers/slapd/back-ldbm/dblayer.h | 14 ldap/servers/slapd/back-ldbm/dbtest.c | 349 ldap/servers/slapd/back-ldbm/dbversion.c | 51 ldap/servers/slapd/back-ldbm/dn2entry.c | 39 ldap/servers/slapd/back-ldbm/filterindex.c | 243 ldap/servers/slapd/back-ldbm/findentry.c | 103 ldap/servers/slapd/back-ldbm/id2entry.c | 172 ldap/servers/slapd/back-ldbm/idl.c | 35 ldap/servers/slapd/back-ldbm/idl_common.c | 6 ldap/servers/slapd/back-ldbm/idl_new.c | 50 ldap/servers/slapd/back-ldbm/idl_shim.c | 17 ldap/servers/slapd/back-ldbm/import-merge.c | 28 ldap/servers/slapd/back-ldbm/import-threads.c | 1357 ldap/servers/slapd/back-ldbm/import.c | 395 ldap/servers/slapd/back-ldbm/import.h | 20 ldap/servers/slapd/back-ldbm/index.c | 186 ldap/servers/slapd/back-ldbm/init.c | 89 ldap/servers/slapd/back-ldbm/instance.c | 43 ldap/servers/slapd/back-ldbm/ldbm_add.c | 237 ldap/servers/slapd/back-ldbm/ldbm_attr.c | 248 ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 986 ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 2 ldap/servers/slapd/back-ldbm/ldbm_bind.c | 4 ldap/servers/slapd/back-ldbm/ldbm_compare.c | 4 ldap/servers/slapd/back-ldbm/ldbm_config.c | 309 ldap/servers/slapd/back-ldbm/ldbm_config.h | 4 ldap/servers/slapd/back-ldbm/ldbm_delete.c | 207 ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 569 ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 109 ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 262 ldap/servers/slapd/back-ldbm/ldbm_modify.c | 136 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 349 ldap/servers/slapd/back-ldbm/ldbm_search.c | 276 ldap/servers/slapd/back-ldbm/ldbm_usn.c | 74 ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 691 ldap/servers/slapd/back-ldbm/matchrule.c | 50 ldap/servers/slapd/back-ldbm/misc.c | 297 ldap/servers/slapd/back-ldbm/monitor.c | 14 ldap/servers/slapd/back-ldbm/nextid.c | 17 ldap/servers/slapd/back-ldbm/perfctrs.c | 24 ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 44 ldap/servers/slapd/back-ldbm/sort.c | 38 ldap/servers/slapd/back-ldbm/start.c | 61 ldap/servers/slapd/back-ldbm/vlv.c | 383 ldap/servers/slapd/back-ldbm/vlv_srch.c | 17 ldap/servers/slapd/back-ldbm/vlv_srch.h | 3 ldap/servers/slapd/back-ldif/back-ldif.h | 2 ldap/servers/slapd/back-ldif/modrdn.c | 12 ldap/servers/slapd/backend.c | 72 ldap/servers/slapd/backend_manager.c | 18 ldap/servers/slapd/bind.c | 306 ldap/servers/slapd/bulk_import.c | 39 ldap/servers/slapd/charray.c | 27 ldap/servers/slapd/compare.c | 41 ldap/servers/slapd/computed.c | 36 ldap/servers/slapd/configdse.c | 84 ldap/servers/slapd/connection.c | 188 ldap/servers/slapd/conntable.c | 3 ldap/servers/slapd/control.c | 26 ldap/servers/slapd/csn.c | 5 ldap/servers/slapd/csngen.c | 54 ldap/servers/slapd/csnset.c | 4 ldap/servers/slapd/daemon.c | 138 ldap/servers/slapd/delete.c | 127 ldap/servers/slapd/dn.c | 1472 ldap/servers/slapd/dse.c | 177 ldap/servers/slapd/dynalib.c | 29 ldap/servers/slapd/entry.c | 758 ldap/servers/slapd/entrywsi.c | 96 ldap/servers/slapd/eventq.c | 4 ldap/servers/slapd/extendop.c | 35 ldap/servers/slapd/factory.c | 1 ldap/servers/slapd/fe.h | 5 ldap/servers/slapd/fedse.c | 26 ldap/servers/slapd/filter.c | 2 ldap/servers/slapd/filter.h | 1 ldap/servers/slapd/filtercmp.c | 25 ldap/servers/slapd/filterentry.c | 27 ldap/servers/slapd/index_subsystem.c | 28 ldap/servers/slapd/intrinsics.h | 7 ldap/servers/slapd/ldaputil.c | 686 ldap/servers/slapd/lenstr.c | 6 ldap/servers/slapd/libglobs.c | 468 ldap/servers/slapd/libslapd.def | 1 ldap/servers/slapd/log.c | 73 ldap/servers/slapd/main.c | 286 ldap/servers/slapd/mapping_tree.c | 353 ldap/servers/slapd/match.c | 96 ldap/servers/slapd/modify.c | 450 ldap/servers/slapd/modrdn.c | 357 ldap/servers/slapd/modutil.c | 21 ldap/servers/slapd/operation.c | 26 ldap/servers/slapd/opshared.c | 281 ldap/servers/slapd/pagedresults.c | 130 ldap/servers/slapd/passwd_extop.c | 199 ldap/servers/slapd/pblock.c | 519 ldap/servers/slapd/plugin.c | 319 ldap/servers/slapd/plugin_acl.c | 19 ldap/servers/slapd/plugin_internal_op.c | 176 ldap/servers/slapd/plugin_mr.c | 474 ldap/servers/slapd/plugin_syntax.c | 362 ldap/servers/slapd/protect_db.c | 24 ldap/servers/slapd/protect_db.h | 7 ldap/servers/slapd/proto-slap.h | 60 ldap/servers/slapd/proxyauth.c | 242 ldap/servers/slapd/psearch.c | 65 ldap/servers/slapd/pw.c | 515 ldap/servers/slapd/pw.h | 5 ldap/servers/slapd/pw_mgmt.c | 159 ldap/servers/slapd/pw_retry.c | 73 ldap/servers/slapd/rdn.c | 129 ldap/servers/slapd/referral.c | 25 ldap/servers/slapd/regex.c | 3 ldap/servers/slapd/resourcelimit.c | 80 ldap/servers/slapd/result.c | 81 ldap/servers/slapd/rootdse.c | 4 ldap/servers/slapd/sasl_io.c | 167 ldap/servers/slapd/sasl_map.c | 57 ldap/servers/slapd/saslbind.c | 160 ldap/servers/slapd/schema.c | 172 ldap/servers/slapd/schemaparse.c | 13 ldap/servers/slapd/search.c | 57 ldap/servers/slapd/security_wrappers.c | 36 ldap/servers/slapd/slap.h | 157 ldap/servers/slapd/slapi-plugin-compat4.h | 6 ldap/servers/slapd/slapi-plugin.h | 952 ldap/servers/slapd/slapi-private.h | 51 ldap/servers/slapd/slapi2nspr.c | 79 ldap/servers/slapd/slapi_counter.c | 24 ldap/servers/slapd/snmp_collator.c | 17 ldap/servers/slapd/ssl.c | 299 ldap/servers/slapd/str2filter.c | 1 ldap/servers/slapd/task.c | 128 ldap/servers/slapd/test-plugins/testbind.c | 1 ldap/servers/slapd/test-plugins/testpostop.c | 1 ldap/servers/slapd/time.c | 91 ldap/servers/slapd/tools/dbscan.c | 72 ldap/servers/slapd/tools/ldclt/data.c | 50 ldap/servers/slapd/tools/ldclt/ldapfct.c | 1109 ldap/servers/slapd/tools/ldclt/ldclt.c | 33 ldap/servers/slapd/tools/ldclt/ldclt.h | 3 ldap/servers/slapd/tools/ldclt/ldcltU.c | 24 ldap/servers/slapd/tools/ldclt/parser.c | 19 ldap/servers/slapd/tools/ldclt/scalab01.c | 182 ldap/servers/slapd/tools/ldif.c | 4 ldap/servers/slapd/tools/mmldif.c | 9 ldap/servers/slapd/tools/pwenc.c | 2 ldap/servers/slapd/tools/rsearch/addthread.c | 25 ldap/servers/slapd/tools/rsearch/sdattable.c | 4 ldap/servers/slapd/tools/rsearch/searchthread.c | 62 ldap/servers/slapd/utf8compare.c | 2 ldap/servers/slapd/util.c | 171 ldap/servers/slapd/uuid.c | 22 ldap/servers/slapd/value.c | 39 ldap/servers/slapd/valueset.c | 75 ldap/servers/slapd/vattr.c | 109 ldap/servers/snmp/ldap-agent.c | 26 ldap/servers/snmp/main.c | 11 ldap/systools/idsktune.c | 65 lib/base/crit.cpp | 6 lib/base/ereport.cpp | 2 lib/base/lexer.cpp | 1015 lib/base/plist.cpp | 3 lib/base/util.cpp | 13 lib/ldaputil/cert.c | 4 lib/ldaputil/certmap.c | 409 lib/ldaputil/dbconf.c | 1 lib/ldaputil/utest/Makefile | 149 lib/ldaputil/utest/auth.cpp | 611 lib/ldaputil/utest/authtest | 138 lib/ldaputil/utest/certmap.conf | 68 lib/ldaputil/utest/dblist.conf | 47 lib/ldaputil/utest/example.c | 153 lib/ldaputil/utest/plugin.c | 152 lib/ldaputil/utest/plugin.h | 57 lib/ldaputil/utest/stubs.c | 144 lib/ldaputil/utest/stubs.cpp | 139 lib/ldaputil/utest/test.ref | 480 lib/ldaputil/vtable.c | 2 lib/libaccess/acl.tab.cpp | 21 lib/libaccess/aclcache.cpp | 105 lib/libaccess/aclflush.cpp | 1 lib/libaccess/aclpriv.h | 1 lib/libaccess/acltools.cpp | 1896 lib/libaccess/aclutil.cpp | 13 lib/libaccess/authdb.cpp | 112 lib/libaccess/lasdns.cpp | 23 lib/libaccess/lasgroup.cpp | 10 lib/libaccess/lasip.cpp | 16 lib/libaccess/nseframe.cpp | 1 lib/libaccess/oneeval.cpp | 19 lib/libaccess/permhash.h | 11 lib/libaccess/register.cpp | 50 lib/libaccess/usrcache.cpp | 14 lib/libaccess/utest/.purify | 19 lib/libaccess/utest/Makefile | 147 lib/libaccess/utest/acl.dat | 44 lib/libaccess/utest/aclfile0 | 87 lib/libaccess/utest/aclfile1 | 43 lib/libaccess/utest/aclfile10 | 45 lib/libaccess/utest/aclfile11 | 43 lib/libaccess/utest/aclfile12 | 43 lib/libaccess/utest/aclfile13 | 43 lib/libaccess/utest/aclfile14 | 43 lib/libaccess/utest/aclfile15 | 43 lib/libaccess/utest/aclfile16 | 43 lib/libaccess/utest/aclfile17 | 43 lib/libaccess/utest/aclfile18 | 51 lib/libaccess/utest/aclfile19 | 46 lib/libaccess/utest/aclfile2 | 43 lib/libaccess/utest/aclfile3 | 43 lib/libaccess/utest/aclfile4 | 43 lib/libaccess/utest/aclfile5 | 43 lib/libaccess/utest/aclfile6 | 55 lib/libaccess/utest/aclfile7 | 43 lib/libaccess/utest/aclfile8 | 43 lib/libaccess/utest/aclfile9 | 43 lib/libaccess/utest/aclgrp0 | 42 lib/libaccess/utest/aclgrp1 | 42 lib/libaccess/utest/aclgrp2 | 42 lib/libaccess/utest/aclgrp3 | 42 lib/libaccess/utest/aclgrp4 | 42 lib/libaccess/utest/acltest.cpp | 794 lib/libaccess/utest/onetest.cpp | 77 lib/libaccess/utest/shexp.cpp | 331 lib/libaccess/utest/shexp.h | 168 lib/libaccess/utest/test.ref | 217 lib/libaccess/utest/testmain.cpp | 89 lib/libaccess/utest/twotest.cpp | 87 lib/libaccess/utest/ustubs.cpp | 331 lib/libadmin/error.c | 2 lib/libadmin/template.c | 2 lib/libadmin/util.c | 48 lib/libsi18n/coreres.c | 141 lib/libsi18n/coreres.h | 52 lib/libsi18n/getlang.c | 330 lib/libsi18n/getstrmem.c | 160 lib/libsi18n/getstrmem.h | 1 lib/libsi18n/getstrprop.c | 85 lib/libsi18n/makstrdb.c | 21 lib/libsi18n/propset.c | 442 lib/libsi18n/propset.h | 80 lib/libsi18n/reshash.c | 21 ltmain.sh |13199 ++- m4/db.m4 | 21 m4/fhs.m4 | 4 m4/icu.m4 | 25 m4/kerberos.m4 | 4 m4/mozldap.m4 | 38 m4/netsnmp.m4 | 15 m4/nspr.m4 | 17 m4/nss.m4 | 17 m4/openldap.m4 | 30 m4/pcre.m4 | 28 m4/sasl.m4 | 25 m4/selinux.m4 | 13 m4/svrcore.m4 | 41 man/man8/restart-dirsrv.8 | 50 man/man8/start-dirsrv.8 | 50 man/man8/stop-dirsrv.8 | 50 missing | 104 selinux/dirsrv.fc.in | 2 selinux/dirsrv.if | 41 selinux/dirsrv.te | 11 wrappers/cl-dump.in | 11 wrappers/dbscan.in | 10 wrappers/infadd.in | 12 wrappers/initscript.in | 243 wrappers/ldap-agent-initscript.in | 20 wrappers/ldap-agent.in | 12 wrappers/ldclt.in | 12 wrappers/ldif.in | 12 wrappers/migratecred.in | 14 wrappers/mmldif.in | 14 wrappers/pwdhash.in | 14 wrappers/repl-monitor.in | 11 wrappers/rsearch.in | 12 wrappers/systemd-snmp.service.in | 16 wrappers/systemd.group.in | 6 wrappers/systemd.template.service.in | 26 570 files changed, 74159 insertions(+), 62215 deletions(-) ---

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits November 2011