/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ac/string.h>
#include <ac/time.h>
-#include "ldap_pvt.h"
#include "slap.h"
#include "lutil.h"
for( ; attrs->an_name.bv_val; attrs++ ) {
AttributeType *a;
ObjectClass *oc;
- int rc;
if ( attrs->an_desc ) {
int lr;
}
if( oc != NULL ) {
if ( attrs->an_oc_exclude ) {
- int gotit = 0;
-
if ( oc == slap_schema.si_oc_extensibleObject ) {
/* extensibleObject allows the return of anything */
return 0;
}
an = ch_realloc( an, ( i + j + 1 ) * sizeof( AttributeName ) );
+ BER_BVZERO( &an[i + j].an_name );
anew = an + i;
for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
s != NULL;
attrs = anlist2charray( anlist, 1 );
for ( i = 0; anlist[i].an_name.bv_val; i++ ) {
- if ( oc = anlist[i].an_oc ) {
+ if ( ( oc = anlist[i].an_oc ) ) {
for ( j = 0; oc->soc_required && oc->soc_required[j]; j++ ) ;
k += j;
for ( j = 0; oc->soc_allowed && oc->soc_allowed[j]; j++ ) ;
attrs = (char **) ch_realloc( attrs, (i + k + 1) * sizeof( char * ));
for ( i = 0; anlist[i].an_name.bv_val; i++ ) {
- if ( oc = anlist[i].an_oc ) {
+ if ( ( oc = anlist[i].an_oc ) ) {
for ( j = 0; oc->soc_required && oc->soc_required[j]; j++ ) {
attrs[n++] = ch_strdup(
oc->soc_required[j]->sat_cname.bv_val );
}
while ( fgets( lcur, LBUFSIZ, fp ) != NULL ) {
- char *str, *s, *next;
- const char *delimstr = brkstr;
- if (c = strchr( lcur, '\n' )) {
+ if ( ( c = strchr( lcur, '\n' ) ) ) {
if ( c == line ) {
*c = '\0';
} else if ( *(c-1) == '\r' ) {