1999-09-09 03:06:24 +08:00
|
|
|
/* $OpenLDAP$ */
|
1999-08-07 07:07:46 +08:00
|
|
|
/*
|
|
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
|
|
*/
|
1998-08-09 08:43:13 +08:00
|
|
|
/* attr.c - routines for dealing with attributes */
|
|
|
|
|
1998-10-25 09:41:42 +08:00
|
|
|
#include "portable.h"
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
#include <stdio.h>
|
1998-10-25 09:41:42 +08:00
|
|
|
|
|
|
|
#ifdef HAVE_FCNTL_H
|
1998-08-09 08:43:13 +08:00
|
|
|
#include <fcntl.h>
|
1998-10-25 09:41:42 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <ac/ctype.h>
|
1998-11-16 13:07:27 +08:00
|
|
|
#include <ac/errno.h>
|
1998-10-25 09:41:42 +08:00
|
|
|
#include <ac/socket.h>
|
|
|
|
#include <ac/string.h>
|
|
|
|
#include <ac/time.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
1998-08-09 08:43:13 +08:00
|
|
|
#include <sys/param.h>
|
1998-10-25 09:41:42 +08:00
|
|
|
#endif
|
|
|
|
|
1999-08-25 14:44:08 +08:00
|
|
|
#include "ldap_pvt.h"
|
1998-08-09 08:43:13 +08:00
|
|
|
#include "slap.h"
|
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
#ifdef LDAP_DEBUG
|
|
|
|
static void at_index_print( void );
|
|
|
|
#endif
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
void
|
|
|
|
attr_free( Attribute *a )
|
|
|
|
{
|
|
|
|
free( a->a_type );
|
|
|
|
ber_bvecfree( a->a_vals );
|
|
|
|
free( a );
|
|
|
|
}
|
|
|
|
|
1999-07-29 12:41:49 +08:00
|
|
|
void
|
|
|
|
attrs_free( Attribute *a )
|
|
|
|
{
|
|
|
|
Attribute *next;
|
|
|
|
|
|
|
|
for( ; a != NULL ; a = next ) {
|
|
|
|
next = a->a_next;
|
|
|
|
attr_free( a );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Attribute *attr_dup( Attribute *a )
|
|
|
|
{
|
|
|
|
Attribute *tmp;
|
|
|
|
|
|
|
|
if( a == NULL) return NULL;
|
|
|
|
|
|
|
|
tmp = ch_malloc( sizeof(Attribute) );
|
|
|
|
|
|
|
|
if( a->a_vals != NULL ) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for( i=0; a->a_vals[i] != NULL; i++ ) {
|
|
|
|
/* EMPTY */ ;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval*));
|
|
|
|
|
|
|
|
for( i=0; a->a_vals[i] != NULL; i++ ) {
|
|
|
|
tmp->a_vals[i] = ber_bvdup( a->a_vals[i] );
|
1999-08-21 06:59:00 +08:00
|
|
|
|
|
|
|
if( tmp->a_vals[i] == NULL ) break;
|
1999-07-29 12:41:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
tmp->a_vals[i] = NULL;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
tmp->a_vals = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp->a_type = ch_strdup( a->a_type );
|
|
|
|
tmp->a_syntax = a->a_syntax;
|
|
|
|
tmp->a_next = NULL;
|
|
|
|
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
Attribute *attrs_dup( Attribute *a )
|
|
|
|
{
|
|
|
|
Attribute *tmp, **next;
|
|
|
|
|
|
|
|
if( a == NULL ) return NULL;
|
|
|
|
|
|
|
|
tmp = NULL;
|
|
|
|
next = &tmp;
|
|
|
|
|
|
|
|
for( ; a != NULL ; a = a->a_next ) {
|
|
|
|
*next = attr_dup( a );
|
|
|
|
next = &((*next)->a_next);
|
|
|
|
}
|
|
|
|
*next = NULL;
|
|
|
|
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
/*
|
|
|
|
* attr_normalize - normalize an attribute name (make it all lowercase)
|
|
|
|
*/
|
|
|
|
|
|
|
|
char *
|
|
|
|
attr_normalize( char *s )
|
|
|
|
{
|
1999-05-27 09:36:38 +08:00
|
|
|
assert( s != NULL );
|
|
|
|
|
1999-08-25 14:44:08 +08:00
|
|
|
return( ldap_pvt_str2lower( s ) );
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* attr_merge_fast - merge the given type and value with the list of
|
|
|
|
* attributes in attrs. called from str2entry(), where we can make some
|
|
|
|
* assumptions to make things faster.
|
|
|
|
* returns 0 everything went ok
|
|
|
|
* -1 trouble
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
attr_merge_fast(
|
|
|
|
Entry *e,
|
|
|
|
char *type,
|
|
|
|
struct berval **vals,
|
|
|
|
int nvals,
|
|
|
|
int naddvals,
|
|
|
|
int *maxvals,
|
|
|
|
Attribute ***a
|
|
|
|
)
|
|
|
|
{
|
|
|
|
if ( *a == NULL ) {
|
|
|
|
for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) {
|
|
|
|
if ( strcasecmp( (**a)->a_type, type ) == 0 ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( **a == NULL ) {
|
|
|
|
**a = (Attribute *) ch_malloc( sizeof(Attribute) );
|
1998-11-28 04:21:54 +08:00
|
|
|
(**a)->a_type = attr_normalize( ch_strdup( type ) );
|
1998-08-09 08:43:13 +08:00
|
|
|
(**a)->a_vals = NULL;
|
|
|
|
(**a)->a_syntax = attr_syntax( type );
|
|
|
|
(**a)->a_next = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return( value_add_fast( &(**a)->a_vals, vals, nvals, naddvals,
|
|
|
|
maxvals ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* attr_merge - merge the given type and value with the list of
|
|
|
|
* attributes in attrs.
|
|
|
|
* returns 0 everything went ok
|
|
|
|
* -1 trouble
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
attr_merge(
|
|
|
|
Entry *e,
|
|
|
|
char *type,
|
|
|
|
struct berval **vals
|
|
|
|
)
|
|
|
|
{
|
|
|
|
Attribute **a;
|
|
|
|
|
|
|
|
for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
|
|
|
|
if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( *a == NULL ) {
|
|
|
|
*a = (Attribute *) ch_malloc( sizeof(Attribute) );
|
1998-11-28 04:21:54 +08:00
|
|
|
(*a)->a_type = attr_normalize( ch_strdup( type ) );
|
1998-08-09 08:43:13 +08:00
|
|
|
(*a)->a_vals = NULL;
|
|
|
|
(*a)->a_syntax = attr_syntax( type );
|
|
|
|
(*a)->a_next = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return( value_add( &(*a)->a_vals, vals ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* attr_find - find and return attribute type in list a
|
|
|
|
*/
|
|
|
|
|
|
|
|
Attribute *
|
|
|
|
attr_find(
|
|
|
|
Attribute *a,
|
1999-08-21 03:00:44 +08:00
|
|
|
const char *type
|
1998-08-09 08:43:13 +08:00
|
|
|
)
|
|
|
|
{
|
|
|
|
for ( ; a != NULL; a = a->a_next ) {
|
|
|
|
if ( strcasecmp( a->a_type, type ) == 0 ) {
|
|
|
|
return( a );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return( NULL );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* attr_delete - delete the attribute type in list pointed to by attrs
|
|
|
|
* return 0 deleted ok
|
|
|
|
* 1 not found in list a
|
|
|
|
* -1 something bad happened
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
attr_delete(
|
|
|
|
Attribute **attrs,
|
1999-08-21 03:00:44 +08:00
|
|
|
const char *type
|
1998-08-09 08:43:13 +08:00
|
|
|
)
|
|
|
|
{
|
|
|
|
Attribute **a;
|
|
|
|
Attribute *save;
|
|
|
|
|
|
|
|
for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
|
|
|
|
if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( *a == NULL ) {
|
|
|
|
return( 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
save = *a;
|
|
|
|
*a = (*a)->a_next;
|
|
|
|
attr_free( save );
|
|
|
|
|
|
|
|
return( 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
#define DEFAULT_SYNTAX SYNTAX_CIS
|
|
|
|
|
|
|
|
/*
|
|
|
|
* attr_syntax - return the syntax of attribute type
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
attr_syntax( char *type )
|
|
|
|
{
|
1999-05-28 22:27:07 +08:00
|
|
|
AttributeType *sat;
|
|
|
|
|
|
|
|
sat = at_find(type);
|
|
|
|
if ( sat ) {
|
|
|
|
return( sat->sat_syntax_compat );
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return( DEFAULT_SYNTAX );
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* attr_syntax_config - process an attribute syntax config line
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
attr_syntax_config(
|
1999-08-21 03:00:44 +08:00
|
|
|
const char *fname,
|
1998-08-09 08:43:13 +08:00
|
|
|
int lineno,
|
|
|
|
int argc,
|
|
|
|
char **argv
|
|
|
|
)
|
|
|
|
{
|
|
|
|
char *save;
|
1999-05-28 22:27:07 +08:00
|
|
|
LDAP_ATTRIBUTE_TYPE *at;
|
1999-03-09 15:15:35 +08:00
|
|
|
int lasti;
|
1999-05-28 22:27:07 +08:00
|
|
|
int code;
|
1999-06-14 22:34:07 +08:00
|
|
|
const char *err;
|
1998-08-09 08:43:13 +08:00
|
|
|
|
|
|
|
if ( argc < 2 ) {
|
|
|
|
Debug( LDAP_DEBUG_ANY,
|
|
|
|
"%s: line %d: missing name in \"attribute <name>+ <syntax>\" (ignored)\n",
|
|
|
|
fname, lineno, 0 );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
at = (LDAP_ATTRIBUTE_TYPE *)
|
|
|
|
ch_calloc( 1, sizeof(LDAP_ATTRIBUTE_TYPE) );
|
1998-08-09 08:43:13 +08:00
|
|
|
|
|
|
|
lasti = argc - 1;
|
|
|
|
if ( strcasecmp( argv[lasti], "caseignorestring" ) == 0 ||
|
|
|
|
strcasecmp( argv[lasti], "cis" ) == 0 ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.15";
|
|
|
|
at->at_equality_oid = "2.5.13.2";
|
1999-06-17 21:11:30 +08:00
|
|
|
at->at_ordering_oid = "2.5.13.3";
|
|
|
|
at->at_substr_oid = "2.5.13.4";
|
1998-08-09 08:43:13 +08:00
|
|
|
} else if ( strcasecmp( argv[lasti], "telephone" ) == 0 ||
|
|
|
|
strcasecmp( argv[lasti], "tel" ) == 0 ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.50";
|
|
|
|
at->at_equality_oid = "2.5.13.20";
|
1999-06-17 21:11:30 +08:00
|
|
|
at->at_substr_oid = "2.5.13.21";
|
1998-08-09 08:43:13 +08:00
|
|
|
} else if ( strcasecmp( argv[lasti], "dn" ) == 0 ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.12";
|
|
|
|
at->at_equality_oid = "2.5.13.1";
|
1998-08-09 08:43:13 +08:00
|
|
|
} else if ( strcasecmp( argv[lasti], "caseexactstring" ) == 0 ||
|
|
|
|
strcasecmp( argv[lasti], "ces" ) == 0 ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.15";
|
1999-06-17 21:11:30 +08:00
|
|
|
at->at_equality_oid = "2.5.13.5";
|
|
|
|
at->at_ordering_oid = "2.5.13.6";
|
|
|
|
at->at_substr_oid = "2.5.13.7";
|
1998-08-09 08:43:13 +08:00
|
|
|
} else if ( strcasecmp( argv[lasti], "binary" ) == 0 ||
|
|
|
|
strcasecmp( argv[lasti], "bin" ) == 0 ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
at->at_syntax_oid = "1.3.6.1.4.1.1466.115.121.1.5";
|
|
|
|
/* There is no match for binary syntax. Really */
|
1998-08-09 08:43:13 +08:00
|
|
|
} else {
|
|
|
|
Debug( LDAP_DEBUG_ANY,
|
|
|
|
"%s: line %d: unknown syntax \"%s\" in attribute line (ignored)\n",
|
Protoized, moved extern definitions to .h files, fixed related bugs.
Most function and variable definitions are now preceded by its extern
definition, for error checking. Retyped a number of functions, usually
to return void. Fixed a number of printf format errors.
API changes (in ldap/include):
Added avl_dup_ok, avl_prefixapply, removed ber_fatten (probably typo
for ber_flatten), retyped ldap_sort_strcasecmp, grew lutil.h.
A number of `extern' declarations are left (some added by protoize), to
be cleaned away later. Mostly strdup(), strcasecmp(), mktemp(), optind,
optarg, errno.
1998-11-16 06:40:11 +08:00
|
|
|
fname, lineno, argv[lasti] );
|
1998-08-09 08:43:13 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY,
|
|
|
|
"possible syntaxes are \"cis\", \"ces\", \"tel\", \"dn\", or \"bin\"\n",
|
|
|
|
0, 0, 0 );
|
1999-05-28 22:27:07 +08:00
|
|
|
free( (AttributeType *) at );
|
1998-08-09 08:43:13 +08:00
|
|
|
return;
|
|
|
|
}
|
1999-05-28 22:27:07 +08:00
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
save = argv[lasti];
|
|
|
|
argv[lasti] = NULL;
|
1999-08-21 03:50:11 +08:00
|
|
|
at->at_names = charray_dup( argv );
|
1998-08-09 08:43:13 +08:00
|
|
|
argv[lasti] = save;
|
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
code = at_add( at, &err );
|
|
|
|
if ( code ) {
|
|
|
|
fprintf( stderr, "%s: line %d: %s %s\n",
|
|
|
|
fname, lineno, scherr2str(code), err);
|
1999-08-04 02:14:24 +08:00
|
|
|
exit( EXIT_FAILURE );
|
1999-05-28 22:27:07 +08:00
|
|
|
}
|
|
|
|
ldap_memfree(at);
|
|
|
|
}
|
1998-08-09 08:43:13 +08:00
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
int
|
|
|
|
at_fake_if_needed(
|
|
|
|
char *name
|
|
|
|
)
|
|
|
|
{
|
|
|
|
char *argv[3];
|
1998-08-09 08:43:13 +08:00
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
if ( at_find( name ) ) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
argv[0] = name;
|
|
|
|
argv[1] = "cis";
|
|
|
|
argv[2] = NULL;
|
|
|
|
attr_syntax_config( "implicit", 0, 2, argv );
|
|
|
|
return 0;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
struct aindexrec {
|
|
|
|
char *air_name;
|
|
|
|
AttributeType *air_at;
|
|
|
|
};
|
|
|
|
|
|
|
|
static Avlnode *attr_index = NULL;
|
|
|
|
static AttributeType *attr_list = NULL;
|
|
|
|
|
|
|
|
static int
|
|
|
|
attr_index_cmp(
|
|
|
|
struct aindexrec *air1,
|
|
|
|
struct aindexrec *air2
|
|
|
|
)
|
|
|
|
{
|
|
|
|
return (strcasecmp( air1->air_name, air2->air_name ));
|
|
|
|
}
|
1998-08-09 08:43:13 +08:00
|
|
|
|
Protoized, moved extern definitions to .h files, fixed related bugs.
Most function and variable definitions are now preceded by its extern
definition, for error checking. Retyped a number of functions, usually
to return void. Fixed a number of printf format errors.
API changes (in ldap/include):
Added avl_dup_ok, avl_prefixapply, removed ber_fatten (probably typo
for ber_flatten), retyped ldap_sort_strcasecmp, grew lutil.h.
A number of `extern' declarations are left (some added by protoize), to
be cleaned away later. Mostly strdup(), strcasecmp(), mktemp(), optind,
optarg, errno.
1998-11-16 06:40:11 +08:00
|
|
|
static int
|
1999-05-28 22:27:07 +08:00
|
|
|
attr_index_name_cmp(
|
|
|
|
char *type,
|
|
|
|
struct aindexrec *air
|
|
|
|
)
|
|
|
|
{
|
|
|
|
return (strcasecmp( type, air->air_name ));
|
|
|
|
}
|
|
|
|
|
|
|
|
AttributeType *
|
|
|
|
at_find(
|
1999-06-14 22:34:07 +08:00
|
|
|
const char *name
|
1999-05-28 22:27:07 +08:00
|
|
|
)
|
|
|
|
{
|
|
|
|
struct aindexrec *air = NULL;
|
|
|
|
|
|
|
|
if ( (air = (struct aindexrec *) avl_find( attr_index, name,
|
|
|
|
(AVL_CMP) attr_index_name_cmp )) != NULL ) {
|
|
|
|
return( air->air_at );
|
|
|
|
}
|
|
|
|
return( NULL );
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_append_to_list(
|
|
|
|
AttributeType *sat,
|
|
|
|
AttributeType ***listp
|
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType **list;
|
|
|
|
AttributeType **list1;
|
|
|
|
int size;
|
|
|
|
|
|
|
|
list = *listp;
|
|
|
|
if ( !list ) {
|
|
|
|
size = 2;
|
|
|
|
list = calloc(size, sizeof(AttributeType *));
|
|
|
|
if ( !list ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
size = 0;
|
|
|
|
list1 = *listp;
|
|
|
|
while ( *list1 ) {
|
|
|
|
size++;
|
|
|
|
list1++;
|
|
|
|
}
|
|
|
|
size += 2;
|
|
|
|
list1 = realloc(list, size*sizeof(AttributeType *));
|
|
|
|
if ( !list1 ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
list = list1;
|
|
|
|
}
|
|
|
|
list[size-2] = sat;
|
|
|
|
list[size-1] = NULL;
|
|
|
|
*listp = list;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_delete_from_list(
|
|
|
|
int pos,
|
|
|
|
AttributeType ***listp
|
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType **list;
|
|
|
|
AttributeType **list1;
|
|
|
|
int i;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
if ( pos < 0 ) {
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
list = *listp;
|
|
|
|
for ( i=0; list[i]; i++ )
|
|
|
|
;
|
|
|
|
if ( pos >= i ) {
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
for ( i=pos, j=pos+1; list[j]; i++, j++ ) {
|
|
|
|
list[i] = list[j];
|
|
|
|
}
|
|
|
|
list[i] = NULL;
|
|
|
|
/* Tell the runtime this can be shrinked */
|
|
|
|
list1 = realloc(list, (i+1)*sizeof(AttributeType **));
|
|
|
|
if ( !list1 ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*listp = list1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_find_in_list(
|
|
|
|
AttributeType *sat,
|
|
|
|
AttributeType **list
|
|
|
|
)
|
1998-08-09 08:43:13 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
if ( !list ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for ( i=0; list[i]; i++ ) {
|
|
|
|
if ( sat == list[i] ) {
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
at_insert(
|
|
|
|
AttributeType *sat,
|
1999-06-14 22:34:07 +08:00
|
|
|
const char **err
|
1999-05-28 22:27:07 +08:00
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType **atp;
|
|
|
|
struct aindexrec *air;
|
|
|
|
char **names;
|
|
|
|
|
|
|
|
atp = &attr_list;
|
|
|
|
while ( *atp != NULL ) {
|
|
|
|
atp = &(*atp)->sat_next;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
1999-05-28 22:27:07 +08:00
|
|
|
*atp = sat;
|
|
|
|
|
1999-05-29 02:56:47 +08:00
|
|
|
if ( sat->sat_oid ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
air = (struct aindexrec *)
|
|
|
|
ch_calloc( 1, sizeof(struct aindexrec) );
|
1999-05-29 02:56:47 +08:00
|
|
|
air->air_name = sat->sat_oid;
|
1999-05-28 22:27:07 +08:00
|
|
|
air->air_at = sat;
|
|
|
|
if ( avl_insert( &attr_index, (caddr_t) air,
|
|
|
|
(AVL_CMP) attr_index_cmp,
|
|
|
|
(AVL_DUP) avl_dup_error ) ) {
|
1999-05-29 02:56:47 +08:00
|
|
|
*err = sat->sat_oid;
|
1999-05-28 22:27:07 +08:00
|
|
|
ldap_memfree(air);
|
|
|
|
return SLAP_SCHERR_DUP_ATTR;
|
|
|
|
}
|
|
|
|
/* FIX: temporal consistency check */
|
|
|
|
at_find(air->air_name);
|
|
|
|
}
|
1999-05-29 02:56:47 +08:00
|
|
|
if ( (names = sat->sat_names) ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
while ( *names ) {
|
|
|
|
air = (struct aindexrec *)
|
|
|
|
ch_calloc( 1, sizeof(struct aindexrec) );
|
|
|
|
air->air_name = ch_strdup(*names);
|
|
|
|
air->air_at = sat;
|
|
|
|
if ( avl_insert( &attr_index, (caddr_t) air,
|
|
|
|
(AVL_CMP) attr_index_cmp,
|
|
|
|
(AVL_DUP) avl_dup_error ) ) {
|
|
|
|
*err = *names;
|
|
|
|
ldap_memfree(air);
|
|
|
|
return SLAP_SCHERR_DUP_ATTR;
|
|
|
|
}
|
|
|
|
/* FIX: temporal consistency check */
|
|
|
|
at_find(air->air_name);
|
|
|
|
names++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_add(
|
|
|
|
LDAP_ATTRIBUTE_TYPE *at,
|
1999-06-14 22:34:07 +08:00
|
|
|
const char **err
|
1999-05-28 22:27:07 +08:00
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType *sat;
|
|
|
|
AttributeType *sat1;
|
1999-06-15 03:10:07 +08:00
|
|
|
MatchingRule *mr;
|
|
|
|
Syntax *syn;
|
1999-05-28 22:27:07 +08:00
|
|
|
int code;
|
|
|
|
char *errattr;
|
|
|
|
|
|
|
|
if ( at->at_names && at->at_names[0] ) {
|
|
|
|
errattr = at->at_names[0];
|
1999-06-15 03:10:07 +08:00
|
|
|
} else if ( at->at_oid ) {
|
1999-05-28 22:27:07 +08:00
|
|
|
errattr = at->at_oid;
|
1999-06-15 03:10:07 +08:00
|
|
|
} else {
|
|
|
|
errattr = "";
|
|
|
|
return SLAP_SCHERR_ATTR_INCOMPLETE;
|
1999-05-28 22:27:07 +08:00
|
|
|
}
|
|
|
|
sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );
|
|
|
|
memcpy( &sat->sat_atype, at, sizeof(LDAP_ATTRIBUTE_TYPE));
|
|
|
|
if ( at->at_sup_oid ) {
|
|
|
|
if ( (sat1 = at_find(at->at_sup_oid)) ) {
|
|
|
|
sat->sat_sup = sat1;
|
|
|
|
if ( at_append_to_list(sat, &sat1->sat_subtypes) ) {
|
|
|
|
*err = errattr;
|
|
|
|
return SLAP_SCHERR_OUTOFMEM;
|
|
|
|
}
|
|
|
|
} else {
|
1999-05-30 08:05:24 +08:00
|
|
|
*err = at->at_sup_oid;
|
1999-05-28 22:27:07 +08:00
|
|
|
return SLAP_SCHERR_ATTR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-05-30 08:05:24 +08:00
|
|
|
if ( at->at_syntax_oid ) {
|
1999-06-15 03:10:07 +08:00
|
|
|
if ( (syn = syn_find(sat->sat_syntax_oid)) ) {
|
|
|
|
sat->sat_syntax = syn;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_syntax_oid;
|
|
|
|
return SLAP_SCHERR_SYN_NOT_FOUND;
|
|
|
|
}
|
1999-05-30 08:05:24 +08:00
|
|
|
if ( !strcmp(at->at_syntax_oid,
|
|
|
|
"1.3.6.1.4.1.1466.115.121.1.15") ) {
|
|
|
|
if ( at->at_equality_oid &&
|
1999-06-17 21:11:30 +08:00
|
|
|
!strcmp(at->at_equality_oid, "2.5.13.5") ) {
|
1999-05-30 08:05:24 +08:00
|
|
|
sat->sat_syntax_compat = SYNTAX_CES;
|
|
|
|
} else {
|
|
|
|
sat->sat_syntax_compat = SYNTAX_CIS;
|
|
|
|
}
|
|
|
|
} else if ( !strcmp(at->at_syntax_oid,
|
|
|
|
"1.3.6.1.4.1.1466.115.121.1.50") ) {
|
|
|
|
sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_TEL;
|
|
|
|
} else if ( !strcmp(at->at_syntax_oid,
|
|
|
|
"1.3.6.1.4.1.1466.115.121.1.12") ) {
|
|
|
|
sat->sat_syntax_compat = SYNTAX_CIS | SYNTAX_DN;
|
|
|
|
} else if ( !strcmp(at->at_syntax_oid, "1.3.6.1.4.1.1466.115.121.1.5") ) {
|
|
|
|
sat->sat_syntax_compat = SYNTAX_BIN;
|
1999-05-28 22:27:07 +08:00
|
|
|
} else {
|
1999-05-30 08:05:24 +08:00
|
|
|
sat->sat_syntax_compat = DEFAULT_SYNTAX;
|
1999-05-28 22:27:07 +08:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sat->sat_syntax_compat = DEFAULT_SYNTAX;
|
|
|
|
}
|
|
|
|
|
1999-06-15 03:10:07 +08:00
|
|
|
if ( sat->sat_equality_oid ) {
|
|
|
|
if ( (mr = mr_find(sat->sat_equality_oid)) ) {
|
|
|
|
sat->sat_equality = mr;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_equality_oid;
|
|
|
|
return SLAP_SCHERR_MR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( sat->sat_ordering_oid ) {
|
|
|
|
if ( (mr = mr_find(sat->sat_ordering_oid)) ) {
|
|
|
|
sat->sat_ordering = mr;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_ordering_oid;
|
|
|
|
return SLAP_SCHERR_MR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( sat->sat_substr_oid ) {
|
|
|
|
if ( (mr = mr_find(sat->sat_substr_oid)) ) {
|
|
|
|
sat->sat_substr = mr;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_substr_oid;
|
|
|
|
return SLAP_SCHERR_MR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
1999-06-15 20:32:21 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Now inherit definitions from superiors. We only check the
|
|
|
|
* direct superior since that one has already inherited from
|
|
|
|
* its own superiorss
|
|
|
|
*/
|
|
|
|
if ( sat->sat_sup ) {
|
|
|
|
if ( !sat->sat_syntax ) {
|
|
|
|
sat->sat_syntax = sat->sat_sup->sat_syntax;
|
1999-06-17 23:05:02 +08:00
|
|
|
sat->sat_syntax_len = sat->sat_sup->sat_syntax_len;
|
1999-06-15 20:32:21 +08:00
|
|
|
}
|
|
|
|
if ( !sat->sat_equality ) {
|
|
|
|
sat->sat_equality = sat->sat_sup->sat_equality;
|
|
|
|
}
|
|
|
|
if ( !sat->sat_ordering ) {
|
|
|
|
sat->sat_ordering = sat->sat_sup->sat_ordering;
|
|
|
|
}
|
|
|
|
if ( !sat->sat_substr ) {
|
|
|
|
sat->sat_substr = sat->sat_sup->sat_substr;
|
|
|
|
}
|
|
|
|
}
|
1999-05-28 22:27:07 +08:00
|
|
|
code = at_insert(sat,err);
|
|
|
|
return code;
|
|
|
|
}
|
|
|
|
|
1999-06-12 04:41:07 +08:00
|
|
|
|
|
|
|
char *
|
1999-06-15 00:36:00 +08:00
|
|
|
at_canonical_name( char * a_type )
|
1999-06-12 04:41:07 +08:00
|
|
|
{
|
|
|
|
AttributeType *atp;
|
|
|
|
|
|
|
|
if ( (atp=at_find(a_type)) == NULL ) {
|
|
|
|
|
|
|
|
return a_type;
|
|
|
|
|
|
|
|
} else if ( atp->sat_names
|
|
|
|
&& atp->sat_names[0]
|
|
|
|
&& (*(atp->sat_names[0]) != '\0') ) {
|
|
|
|
|
|
|
|
return atp->sat_names[0];
|
|
|
|
|
|
|
|
} else if (atp->sat_oid && (*atp->sat_oid != '\0')) {
|
|
|
|
|
|
|
|
return atp->sat_oid;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return a_type;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
1999-06-15 00:36:00 +08:00
|
|
|
}/* char * at_canonica_name() */
|
1999-06-12 04:41:07 +08:00
|
|
|
|
|
|
|
|
1999-05-29 02:56:47 +08:00
|
|
|
#if defined( SLAPD_SCHEMA_DN )
|
|
|
|
|
|
|
|
int
|
|
|
|
at_schema_info( Entry *e )
|
|
|
|
{
|
|
|
|
struct berval val;
|
|
|
|
struct berval *vals[2];
|
|
|
|
AttributeType *at;
|
|
|
|
|
|
|
|
vals[0] = &val;
|
|
|
|
vals[1] = NULL;
|
|
|
|
|
|
|
|
for ( at = attr_list; at; at = at->sat_next ) {
|
|
|
|
val.bv_val = ldap_attributetype2str( &at->sat_atype );
|
|
|
|
if ( val.bv_val ) {
|
|
|
|
val.bv_len = strlen( val.bv_val );
|
1999-09-02 16:11:54 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n",
|
|
|
|
(long) val.bv_len, val.bv_val, 0 );
|
1999-05-29 02:56:47 +08:00
|
|
|
attr_merge( e, "attributeTypes", vals );
|
|
|
|
ldap_memfree( val.bv_val );
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-05-28 22:27:07 +08:00
|
|
|
#ifdef LDAP_DEBUG
|
|
|
|
|
|
|
|
static int
|
|
|
|
at_index_printnode( struct aindexrec *air )
|
|
|
|
{
|
|
|
|
|
|
|
|
printf( "%s = %s\n", air->air_name, ldap_attributetype2str(&air->air_at->sat_atype) );
|
1998-08-09 08:43:13 +08:00
|
|
|
return( 0 );
|
|
|
|
}
|
|
|
|
|
Protoized, moved extern definitions to .h files, fixed related bugs.
Most function and variable definitions are now preceded by its extern
definition, for error checking. Retyped a number of functions, usually
to return void. Fixed a number of printf format errors.
API changes (in ldap/include):
Added avl_dup_ok, avl_prefixapply, removed ber_fatten (probably typo
for ber_flatten), retyped ldap_sort_strcasecmp, grew lutil.h.
A number of `extern' declarations are left (some added by protoize), to
be cleaned away later. Mostly strdup(), strcasecmp(), mktemp(), optind,
optarg, errno.
1998-11-16 06:40:11 +08:00
|
|
|
static void
|
1999-05-28 22:27:07 +08:00
|
|
|
at_index_print( void )
|
1998-08-09 08:43:13 +08:00
|
|
|
{
|
1999-05-28 22:27:07 +08:00
|
|
|
printf("Printing attribute type index:\n");
|
|
|
|
(void) avl_apply( attr_index, (AVL_APPLY) at_index_printnode,
|
1999-03-02 08:32:59 +08:00
|
|
|
0, -1, AVL_INORDER );
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|