diff options
author | Nathan Kinder <nkinder@redhat.com> | 2009-01-21 00:00:32 +0000 |
---|---|---|
committer | Nathan Kinder <nkinder@redhat.com> | 2009-01-21 00:00:32 +0000 |
commit | a23e607e3368f009e26f0e65e5ad8f34665da4f1 (patch) | |
tree | 6e9b5231b2e90b9a887fe32bd84bfbb7bb591e5d /ldap/servers/slapd/entry.c | |
parent | b9a1fee404f818bbf1ce20452e199caf64e24855 (diff) | |
download | ds-a23e607e3368f009e26f0e65e5ad8f34665da4f1.tar.gz ds-a23e607e3368f009e26f0e65e5ad8f34665da4f1.tar.xz ds-a23e607e3368f009e26f0e65e5ad8f34665da4f1.zip |
Resolves: 474945
Summary: Consistently deal with attr syntax info struct ref count when fetcvhing and returning them to the global hashtables.
Diffstat (limited to 'ldap/servers/slapd/entry.c')
-rw-r--r-- | ldap/servers/slapd/entry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c index 01d45b26..72b3e340 100644 --- a/ldap/servers/slapd/entry.c +++ b/ldap/servers/slapd/entry.c @@ -304,7 +304,7 @@ str2entry_fast( char *s, int flags, int read_stateinfo ) switch(attr_state) { case ATTRIBUTE_PRESENT: - if(attrlist_find_or_create_locking_optional(&e->e_attrs, type, &a, PR_FALSE, PR_TRUE)==0 /* Found */) + if(attrlist_find_or_create_locking_optional(&e->e_attrs, type, &a, PR_FALSE)==0 /* Found */) { LDAPDebug (LDAP_DEBUG_ANY, "str2entry_fast: Error. Non-contiguous attribute values for %s\n", type, 0, 0); PR_ASSERT(0); @@ -312,7 +312,7 @@ str2entry_fast( char *s, int flags, int read_stateinfo ) } break; case ATTRIBUTE_DELETED: - if(attrlist_find_or_create_locking_optional(&e->e_deleted_attrs, type, &a, PR_FALSE, PR_TRUE)==0 /* Found */) + if(attrlist_find_or_create_locking_optional(&e->e_deleted_attrs, type, &a, PR_FALSE)==0 /* Found */) { LDAPDebug (LDAP_DEBUG_ANY, "str2entry_fast: Error. Non-contiguous deleted attribute values for %s\n", type, 0, 0); PR_ASSERT(0); @@ -940,7 +940,7 @@ str2entry_dupcheck( char *s, int flags, int read_stateinfo ) { int maxvals = 0; Slapi_Attr **a= NULL; - attrlist_find_or_create_locking_optional(alist, sa->sa_type, &a, PR_FALSE, PR_TRUE); + attrlist_find_or_create_locking_optional(alist, sa->sa_type, &a, PR_FALSE); valuearray_add_valuearray_fast( /* JCM should be calling a valueset function */ &(*a)->a_present_values.va, /* JCM .va is private */ sa->sa_present_values.va, |