upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 04:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2004-05-14 04:48:44 +00:00
parent f035e1f18f
commit 74bfae5c22
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/schema.c
View file

@ -67,8 +67,7 @@ schema_info( Entry **entry, const char **text )
vals[0].bv_val = "subentry";
vals[0].bv_len = sizeof("subentry")-1;
if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) )
{
if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
@ -84,8 +83,7 @@ schema_info( Entry **entry, const char **text )
vals[3].bv_val = "extensibleObject";
vals[3].bv_len = sizeof("extensibleObject")-1;
vals[4].bv_val = NULL;
if( attr_merge( e, ad_objectClass, vals, vals ) )
{
if( attr_merge( e, ad_objectClass, vals, vals ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
@ -121,8 +119,7 @@ schema_info( Entry **entry, const char **text )
nvals[0].bv_len = global_schemandn.bv_len -
(nvals[0].bv_val - global_schemandn.bv_val);
if( attr_merge_one( e, desc, vals, nvals ) )
{
if( attr_merge_one( e, desc, vals, nvals ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
@ -162,15 +159,13 @@ schema_info( Entry **entry, const char **text )
vals[0].bv_val = timebuf;
vals[0].bv_len = strlen( timebuf );
if( attr_merge_one( e, ad_createTimestamp, vals, vals ) )
{
if( attr_merge_one( e, ad_createTimestamp, vals, vals ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";
return LDAP_OTHER;
}
if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) )
{
if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) ) {
/* Out of memory, do something about it */
entry_free( e );
*text = "out of memory";