1998-08-09 08:43:13 +08:00
|
|
|
/* dn.c - routines for dealing with distinguished names */
|
1999-09-09 03:06:24 +08:00
|
|
|
/* $OpenLDAP$ */
|
2003-11-27 09:17:14 +08:00
|
|
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
|
|
|
*
|
2008-01-08 08:19:56 +08:00
|
|
|
* Copyright 1998-2008 The OpenLDAP Foundation.
|
2003-11-27 09:17:14 +08:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted only as authorized by the OpenLDAP
|
|
|
|
* Public License.
|
|
|
|
*
|
|
|
|
* A copy of this license is available in the file LICENSE in the
|
|
|
|
* top-level directory of the distribution or, alternatively, at
|
|
|
|
* <http://www.OpenLDAP.org/license.html>.
|
|
|
|
*/
|
|
|
|
/* Portions Copyright (c) 1995 Regents of the University of Michigan.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms are permitted
|
|
|
|
* provided that this notice is preserved and that due credit is given
|
|
|
|
* to the University of Michigan at Ann Arbor. The name of the University
|
|
|
|
* may not be used to endorse or promote products derived from this
|
|
|
|
* software without specific prior written permission. This software
|
|
|
|
* is provided ``as is'' without express or implied warranty.
|
1999-08-07 07:07:46 +08:00
|
|
|
*/
|
1998-08-09 08:43:13 +08:00
|
|
|
|
|
|
|
#include "portable.h"
|
1998-10-25 09:41:42 +08:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include <ac/ctype.h>
|
|
|
|
#include <ac/socket.h>
|
|
|
|
#include <ac/string.h>
|
|
|
|
#include <ac/time.h>
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
#include "slap.h"
|
2002-08-06 10:36:34 +08:00
|
|
|
#include "lutil.h"
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
|
|
|
* The DN syntax-related functions take advantage of the dn representation
|
|
|
|
* handling functions ldap_str2dn/ldap_dn2str. The latter are not schema-
|
|
|
|
* aware, so the attributes and their values need be validated (and possibly
|
|
|
|
* normalized). In the current implementation the required validation/nor-
|
|
|
|
* malization/"pretty"ing are done on newly created DN structural represen-
|
|
|
|
* tations; however the idea is to move towards DN handling in structural
|
|
|
|
* representation instead of the current string representation. To this
|
|
|
|
* purpose, we need to do only the required operations and keep track of
|
|
|
|
* what has been done to minimize their impact on performances.
|
|
|
|
*
|
|
|
|
* Developers are strongly encouraged to use this feature, to speed-up
|
|
|
|
* its stabilization.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define AVA_PRIVATE( ava ) ( ( AttributeDescription * )(ava)->la_private )
|
|
|
|
|
2006-04-29 10:15:53 +08:00
|
|
|
int slap_DN_strict = SLAP_AD_NOINSERT;
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
static int
|
|
|
|
LDAPRDN_validate( LDAPRDN rdn )
|
|
|
|
{
|
|
|
|
int iAVA;
|
|
|
|
int rc;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( rdn != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
|
|
|
|
LDAPAVA *ava = rdn[ iAVA ];
|
|
|
|
AttributeDescription *ad;
|
|
|
|
slap_syntax_validate_func *validate = NULL;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( ava != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
|
|
|
|
const char *text = NULL;
|
|
|
|
|
|
|
|
rc = slap_bv2ad( &ava->la_attr, &ad, &text );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
2005-09-07 01:21:24 +08:00
|
|
|
rc = slap_bv2undef_ad( &ava->la_attr,
|
|
|
|
&ad, &text,
|
2006-04-29 10:15:53 +08:00
|
|
|
SLAP_AD_PROXIED|slap_DN_strict );
|
2005-09-07 01:21:24 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
2004-06-30 07:36:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ava->la_private = ( void * )ad;
|
|
|
|
}
|
|
|
|
|
2006-08-27 01:28:07 +08:00
|
|
|
/*
|
|
|
|
* Do not allow X-ORDERED 'VALUES' naming attributes
|
|
|
|
*/
|
|
|
|
if ( ad->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
/*
|
|
|
|
* Replace attr oid/name with the canonical name
|
|
|
|
*/
|
|
|
|
ava->la_attr = ad->ad_cname;
|
|
|
|
|
|
|
|
validate = ad->ad_type->sat_syntax->ssyn_validate;
|
|
|
|
|
|
|
|
if ( validate ) {
|
|
|
|
/*
|
|
|
|
* validate value by validate function
|
|
|
|
*/
|
|
|
|
rc = ( *validate )( ad->ad_type->sat_syntax,
|
|
|
|
&ava->la_value );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-06-30 09:17:05 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
2004-06-30 07:36:58 +08:00
|
|
|
}
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
|
|
|
* In-place, schema-aware validation of the
|
|
|
|
* structural representation of a distinguished name.
|
|
|
|
*/
|
|
|
|
static int
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN_validate( LDAPDN dn )
|
2001-12-23 09:19:46 +08:00
|
|
|
{
|
|
|
|
int iRDN;
|
|
|
|
int rc;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( dn != NULL );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
|
2006-08-27 01:55:56 +08:00
|
|
|
rc = LDAPRDN_validate( dn[ iRDN ] );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return rc;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2001-12-08 14:57:06 +08:00
|
|
|
/*
|
2001-12-23 09:19:46 +08:00
|
|
|
* dn validate routine
|
2001-12-08 14:57:06 +08:00
|
|
|
*/
|
2001-12-23 09:19:46 +08:00
|
|
|
int
|
|
|
|
dnValidate(
|
|
|
|
Syntax *syntax,
|
|
|
|
struct berval *in )
|
2001-12-08 14:57:06 +08:00
|
|
|
{
|
2001-12-23 09:19:46 +08:00
|
|
|
int rc;
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN dn = NULL;
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( in != NULL );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
|
|
|
if ( in->bv_len == 0 ) {
|
2002-02-14 02:11:52 +08:00
|
|
|
return LDAP_SUCCESS;
|
|
|
|
|
|
|
|
} else if ( in->bv_len > SLAP_LDAPDN_MAXLEN ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
|
2002-02-13 18:05:22 +08:00
|
|
|
rc = ldap_bv2dn( in, &dn, LDAP_DN_FORMAT_LDAP );
|
2002-02-14 00:41:41 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert( strlen( in->bv_val ) == in->bv_len );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2001-12-08 14:57:06 +08:00
|
|
|
/*
|
2001-12-23 09:19:46 +08:00
|
|
|
* Schema-aware validate
|
2001-12-08 14:57:06 +08:00
|
|
|
*/
|
2002-02-14 00:41:41 +08:00
|
|
|
rc = LDAPDN_validate( dn );
|
2002-02-14 03:25:58 +08:00
|
|
|
ldap_dnfree( dn );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
2002-02-14 03:25:58 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
int
|
|
|
|
rdnValidate(
|
|
|
|
Syntax *syntax,
|
|
|
|
struct berval *in )
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
LDAPRDN rdn;
|
|
|
|
char* p;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( in != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
if ( in->bv_len == 0 ) {
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
|
|
|
|
} else if ( in->bv_len > SLAP_LDAPDN_MAXLEN ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = ldap_bv2rdn_x( in , &rdn, (char **) &p,
|
|
|
|
LDAP_DN_FORMAT_LDAP, NULL);
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert( strlen( in->bv_val ) == in->bv_len );
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Schema-aware validate
|
|
|
|
*/
|
|
|
|
rc = LDAPRDN_validate( rdn );
|
|
|
|
ldap_rdnfree( rdn );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
|
|
|
* AVA sorting inside a RDN
|
|
|
|
*
|
|
|
|
* rule: sort attributeTypes in alphabetical order; in case of multiple
|
|
|
|
* occurrences of the same attributeType, sort values in byte order
|
|
|
|
* (use memcmp, which implies alphabetical order in case of IA5 value;
|
|
|
|
* this should guarantee the repeatability of the operation).
|
|
|
|
*
|
2002-01-17 02:51:20 +08:00
|
|
|
* Note: the sorting can be slightly improved by sorting first
|
|
|
|
* by attribute type length, then by alphabetical order.
|
|
|
|
*
|
2007-07-23 13:23:31 +08:00
|
|
|
* uses an insertion sort; should be fine since the number of AVAs in
|
2001-12-23 09:19:46 +08:00
|
|
|
* a RDN should be limited.
|
|
|
|
*/
|
2007-07-23 13:49:49 +08:00
|
|
|
static int
|
2007-07-23 13:23:31 +08:00
|
|
|
AVA_Sort( LDAPRDN rdn, int nAVAs )
|
2001-12-23 09:19:46 +08:00
|
|
|
{
|
2007-07-23 13:23:31 +08:00
|
|
|
LDAPAVA *ava_i;
|
2001-12-23 09:19:46 +08:00
|
|
|
int i;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( rdn != NULL );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
for ( i = 1; i < nAVAs; i++ ) {
|
|
|
|
LDAPAVA *ava_j;
|
|
|
|
int j;
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
ava_i = rdn[ i ];
|
|
|
|
for ( j = i-1; j >=0; j-- ) {
|
|
|
|
int a;
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
ava_j = rdn[ j ];
|
|
|
|
a = strcmp( ava_i->la_attr.bv_val, ava_j->la_attr.bv_val );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
if ( a == 0 ) {
|
|
|
|
int d;
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
d = ava_i->la_value.bv_len - ava_j->la_value.bv_len;
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
a = memcmp( ava_i->la_value.bv_val,
|
|
|
|
ava_j->la_value.bv_val,
|
|
|
|
d <= 0 ? ava_i->la_value.bv_len
|
|
|
|
: ava_j->la_value.bv_len );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-07-23 13:49:49 +08:00
|
|
|
if ( a == 0 ) {
|
2007-07-23 13:23:31 +08:00
|
|
|
a = d;
|
|
|
|
}
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
2007-07-23 13:49:49 +08:00
|
|
|
/* Duplicates are not allowed */
|
|
|
|
if ( a == 0 )
|
|
|
|
return LDAP_INVALID_DN_SYNTAX;
|
|
|
|
|
|
|
|
if ( a > 0 )
|
2001-12-23 09:19:46 +08:00
|
|
|
break;
|
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
rdn[ j+1 ] = rdn[ j ];
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
2007-07-23 13:23:31 +08:00
|
|
|
rdn[ j+1 ] = ava_i;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
2007-07-23 13:49:49 +08:00
|
|
|
return LDAP_SUCCESS;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
static int
|
|
|
|
LDAPRDN_rewrite( LDAPRDN rdn, unsigned flags, void *ctx )
|
|
|
|
{
|
|
|
|
|
2007-07-23 13:23:31 +08:00
|
|
|
int rc, iAVA, do_sort = 0;
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
|
|
|
|
LDAPAVA *ava = rdn[ iAVA ];
|
|
|
|
AttributeDescription *ad;
|
|
|
|
slap_syntax_validate_func *validf = NULL;
|
|
|
|
slap_mr_normalize_func *normf = NULL;
|
|
|
|
slap_syntax_transform_func *transf = NULL;
|
|
|
|
MatchingRule *mr = NULL;
|
|
|
|
struct berval bv = BER_BVNULL;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( ava != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
|
|
|
|
const char *text = NULL;
|
|
|
|
|
|
|
|
rc = slap_bv2ad( &ava->la_attr, &ad, &text );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
2005-09-07 01:21:24 +08:00
|
|
|
rc = slap_bv2undef_ad( &ava->la_attr,
|
|
|
|
&ad, &text,
|
2006-04-29 10:15:53 +08:00
|
|
|
SLAP_AD_PROXIED|slap_DN_strict );
|
2005-09-07 01:21:24 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
2004-06-30 07:36:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ava->la_private = ( void * )ad;
|
|
|
|
do_sort = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Replace attr oid/name with the canonical name
|
|
|
|
*/
|
|
|
|
ava->la_attr = ad->ad_cname;
|
|
|
|
|
|
|
|
if( ava->la_flags & LDAP_AVA_BINARY ) {
|
|
|
|
if( ava->la_value.bv_len == 0 ) {
|
|
|
|
/* BER encoding is empty */
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2006-08-27 01:28:07 +08:00
|
|
|
/* Do not allow X-ORDERED 'VALUES' naming attributes */
|
|
|
|
} else if( ad->ad_type->sat_flags & SLAP_AT_ORDERED_VAL ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
/* AVA is binary encoded, don't muck with it */
|
|
|
|
} else if( flags & SLAP_LDAPDN_PRETTY ) {
|
|
|
|
transf = ad->ad_type->sat_syntax->ssyn_pretty;
|
|
|
|
if( !transf ) {
|
|
|
|
validf = ad->ad_type->sat_syntax->ssyn_validate;
|
|
|
|
}
|
|
|
|
} else { /* normalization */
|
|
|
|
validf = ad->ad_type->sat_syntax->ssyn_validate;
|
|
|
|
mr = ad->ad_type->sat_equality;
|
2005-12-21 06:36:51 +08:00
|
|
|
if( mr && (!( mr->smr_usage & SLAP_MR_MUTATION_NORMALIZER ))) {
|
|
|
|
normf = mr->smr_normalize;
|
|
|
|
}
|
2004-06-30 07:36:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( validf ) {
|
|
|
|
/* validate value before normalization */
|
|
|
|
rc = ( *validf )( ad->ad_type->sat_syntax,
|
|
|
|
ava->la_value.bv_len
|
|
|
|
? &ava->la_value
|
|
|
|
: (struct berval *) &slap_empty_bv );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( transf ) {
|
|
|
|
/*
|
|
|
|
* transform value by pretty function
|
|
|
|
* if value is empty, use empty_bv
|
|
|
|
*/
|
|
|
|
rc = ( *transf )( ad->ad_type->sat_syntax,
|
|
|
|
ava->la_value.bv_len
|
|
|
|
? &ava->la_value
|
|
|
|
: (struct berval *) &slap_empty_bv,
|
|
|
|
&bv, ctx );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( normf ) {
|
|
|
|
/*
|
|
|
|
* normalize value
|
|
|
|
* if value is empty, use empty_bv
|
|
|
|
*/
|
|
|
|
rc = ( *normf )(
|
|
|
|
SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
|
|
|
|
ad->ad_type->sat_syntax,
|
|
|
|
mr,
|
|
|
|
ava->la_value.bv_len
|
|
|
|
? &ava->la_value
|
|
|
|
: (struct berval *) &slap_empty_bv,
|
|
|
|
&bv, ctx );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if( bv.bv_val ) {
|
|
|
|
if ( ava->la_flags & LDAP_AVA_FREE_VALUE )
|
|
|
|
ber_memfree_x( ava->la_value.bv_val, ctx );
|
|
|
|
ava->la_value = bv;
|
|
|
|
ava->la_flags |= LDAP_AVA_FREE_VALUE;
|
|
|
|
}
|
|
|
|
}
|
2007-07-23 13:49:49 +08:00
|
|
|
rc = LDAP_SUCCESS;
|
2007-07-23 13:23:31 +08:00
|
|
|
|
2007-07-23 13:49:49 +08:00
|
|
|
if ( do_sort ) {
|
|
|
|
rc = AVA_Sort( rdn, iAVA );
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2004-06-30 07:36:58 +08:00
|
|
|
}
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
|
|
|
* In-place, schema-aware normalization / "pretty"ing of the
|
|
|
|
* structural representation of a distinguished name.
|
|
|
|
*/
|
|
|
|
static int
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx )
|
2001-12-23 09:19:46 +08:00
|
|
|
{
|
|
|
|
int iRDN;
|
|
|
|
int rc;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( dn != NULL );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
|
2006-08-27 01:55:56 +08:00
|
|
|
rc = LDAPRDN_rewrite( dn[ iRDN ], flags, ctx );
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return rc;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
dnNormalize(
|
2003-03-01 08:14:32 +08:00
|
|
|
slap_mask_t use,
|
|
|
|
Syntax *syntax,
|
|
|
|
MatchingRule *mr,
|
|
|
|
struct berval *val,
|
2003-04-11 09:29:28 +08:00
|
|
|
struct berval *out,
|
|
|
|
void *ctx)
|
2001-12-29 12:48:00 +08:00
|
|
|
{
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( val != NULL );
|
|
|
|
assert( out != NULL );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 );
|
2001-12-25 02:38:20 +08:00
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
if ( val->bv_len != 0 ) {
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN dn = NULL;
|
2001-12-23 09:19:46 +08:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Go to structural representation
|
|
|
|
*/
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_bv2dn_x( val, &dn, LDAP_DN_FORMAT_LDAP, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2002-02-14 00:41:41 +08:00
|
|
|
assert( strlen( val->bv_val ) == val->bv_len );
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
|
|
|
* Schema-aware rewrite
|
|
|
|
*/
|
2003-04-11 09:29:28 +08:00
|
|
|
if ( LDAPDN_rewrite( dn, 0, ctx ) != LDAP_SUCCESS ) {
|
2003-05-29 06:15:44 +08:00
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Back to string representation
|
|
|
|
*/
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_dn2bv_x( dn, out,
|
|
|
|
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
} else {
|
2003-04-11 09:29:28 +08:00
|
|
|
ber_dupbv_x( out, val, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "<<< dnNormalize: <%s>\n", out->bv_val ? out->bv_val : "", 0, 0 );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
int
|
|
|
|
rdnNormalize(
|
|
|
|
slap_mask_t use,
|
|
|
|
Syntax *syntax,
|
|
|
|
MatchingRule *mr,
|
|
|
|
struct berval *val,
|
|
|
|
struct berval *out,
|
|
|
|
void *ctx)
|
|
|
|
{
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( val != NULL );
|
|
|
|
assert( out != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 );
|
2004-06-30 07:36:58 +08:00
|
|
|
if ( val->bv_len != 0 ) {
|
|
|
|
LDAPRDN rdn = NULL;
|
|
|
|
int rc;
|
|
|
|
char* p;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Go to structural representation
|
|
|
|
*/
|
|
|
|
rc = ldap_bv2rdn_x( val , &rdn, (char **) &p,
|
|
|
|
LDAP_DN_FORMAT_LDAP, ctx);
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert( strlen( val->bv_val ) == val->bv_len );
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Schema-aware rewrite
|
|
|
|
*/
|
|
|
|
if ( LDAPRDN_rewrite( rdn, 0, ctx ) != LDAP_SUCCESS ) {
|
|
|
|
ldap_rdnfree_x( rdn, ctx );
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Back to string representation
|
|
|
|
*/
|
|
|
|
rc = ldap_rdn2bv_x( rdn, out,
|
|
|
|
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
|
|
|
|
|
|
|
|
ldap_rdnfree_x( rdn, ctx );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ber_dupbv_x( out, val, ctx );
|
|
|
|
}
|
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "<<< dnNormalize: <%s>\n", out->bv_val ? out->bv_val : "", 0, 0 );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
int
|
|
|
|
dnPretty(
|
2001-12-29 12:48:00 +08:00
|
|
|
Syntax *syntax,
|
|
|
|
struct berval *val,
|
2003-04-11 09:29:28 +08:00
|
|
|
struct berval *out,
|
|
|
|
void *ctx)
|
2001-12-29 12:48:00 +08:00
|
|
|
{
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( val != NULL );
|
|
|
|
assert( out != NULL );
|
2001-12-29 12:48:00 +08:00
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, ">>> dnPretty: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2002-02-14 02:11:52 +08:00
|
|
|
if ( val->bv_len == 0 ) {
|
2003-04-11 09:29:28 +08:00
|
|
|
ber_dupbv_x( out, val, ctx );
|
2002-02-14 02:11:52 +08:00
|
|
|
|
|
|
|
} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
|
|
|
|
} else {
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN dn = NULL;
|
2001-12-23 09:19:46 +08:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* FIXME: should be liberal in what we accept */
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_bv2dn_x( val, &dn, LDAP_DN_FORMAT_LDAP, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2002-02-14 00:41:41 +08:00
|
|
|
assert( strlen( val->bv_val ) == val->bv_len );
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
|
|
|
* Schema-aware rewrite
|
|
|
|
*/
|
2003-04-11 09:29:28 +08:00
|
|
|
if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY, ctx ) != LDAP_SUCCESS ) {
|
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: not sure why the default isn't pretty */
|
|
|
|
/* RE: the default is the form that is used as
|
|
|
|
* an internal representation; the pretty form
|
|
|
|
* is a variant */
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_dn2bv_x( dn, out,
|
|
|
|
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "<<< dnPretty: <%s>\n", out->bv_val ? out->bv_val : "", 0, 0 );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
2001-12-08 14:57:06 +08:00
|
|
|
}
|
2001-12-23 09:19:46 +08:00
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
int
|
|
|
|
rdnPretty(
|
|
|
|
Syntax *syntax,
|
|
|
|
struct berval *val,
|
|
|
|
struct berval *out,
|
|
|
|
void *ctx)
|
|
|
|
{
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( val != NULL );
|
|
|
|
assert( out != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, ">>> rdnPretty: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
if ( val->bv_len == 0 ) {
|
|
|
|
ber_dupbv_x( out, val, ctx );
|
|
|
|
|
|
|
|
} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
LDAPRDN rdn = NULL;
|
|
|
|
int rc;
|
|
|
|
char* p;
|
|
|
|
|
|
|
|
/* FIXME: should be liberal in what we accept */
|
|
|
|
rc = ldap_bv2rdn_x( val , &rdn, (char **) &p,
|
|
|
|
LDAP_DN_FORMAT_LDAP, ctx);
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert( strlen( val->bv_val ) == val->bv_len );
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Schema-aware rewrite
|
|
|
|
*/
|
|
|
|
if ( LDAPRDN_rewrite( rdn, SLAP_LDAPDN_PRETTY, ctx ) != LDAP_SUCCESS ) {
|
|
|
|
ldap_rdnfree_x( rdn, ctx );
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: not sure why the default isn't pretty */
|
|
|
|
/* RE: the default is the form that is used as
|
|
|
|
* an internal representation; the pretty form
|
|
|
|
* is a variant */
|
|
|
|
rc = ldap_rdn2bv_x( rdn, out,
|
|
|
|
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
|
|
|
|
|
|
|
|
ldap_rdnfree_x( rdn, ctx );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "<<< dnPretty: <%s>\n", out->bv_val ? out->bv_val : "", 0, 0 );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-29 18:55:48 +08:00
|
|
|
int
|
|
|
|
dnPrettyNormalDN(
|
|
|
|
Syntax *syntax,
|
|
|
|
struct berval *val,
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN *dn,
|
|
|
|
int flags,
|
|
|
|
void *ctx )
|
2002-08-29 18:55:48 +08:00
|
|
|
{
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( val != NULL );
|
|
|
|
assert( dn != NULL );
|
2002-08-29 18:55:48 +08:00
|
|
|
|
|
|
|
Debug( LDAP_DEBUG_TRACE, ">>> dn%sDN: <%s>\n",
|
|
|
|
flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal",
|
2007-09-01 21:35:34 +08:00
|
|
|
val->bv_val ? val->bv_val : "", 0 );
|
2002-08-29 18:55:48 +08:00
|
|
|
|
|
|
|
if ( val->bv_len == 0 ) {
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
|
|
|
|
} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* FIXME: should be liberal in what we accept */
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_bv2dn_x( val, dn, LDAP_DN_FORMAT_LDAP, ctx );
|
2002-08-29 18:55:48 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert( strlen( val->bv_val ) == val->bv_len );
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Schema-aware rewrite
|
|
|
|
*/
|
2003-04-11 09:29:28 +08:00
|
|
|
if ( LDAPDN_rewrite( *dn, flags, ctx ) != LDAP_SUCCESS ) {
|
|
|
|
ldap_dnfree_x( *dn, ctx );
|
2002-08-29 18:55:48 +08:00
|
|
|
*dn = NULL;
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "<<< dn%sDN\n",
|
|
|
|
flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal",
|
|
|
|
0, 0 );
|
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2001-12-28 15:27:15 +08:00
|
|
|
/*
|
|
|
|
* Combination of both dnPretty and dnNormalize
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
dnPrettyNormal(
|
|
|
|
Syntax *syntax,
|
|
|
|
struct berval *val,
|
|
|
|
struct berval *pretty,
|
2003-04-11 09:29:28 +08:00
|
|
|
struct berval *normal,
|
|
|
|
void *ctx)
|
2001-12-28 15:27:15 +08:00
|
|
|
{
|
2007-09-01 21:35:34 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val ? val->bv_val : "", 0, 0 );
|
2001-12-28 15:27:15 +08:00
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( val != NULL );
|
|
|
|
assert( pretty != NULL );
|
|
|
|
assert( normal != NULL );
|
2001-12-28 15:27:15 +08:00
|
|
|
|
2002-02-14 02:11:52 +08:00
|
|
|
if ( val->bv_len == 0 ) {
|
2003-04-11 09:29:28 +08:00
|
|
|
ber_dupbv_x( pretty, val, ctx );
|
|
|
|
ber_dupbv_x( normal, val, ctx );
|
2002-02-14 02:11:52 +08:00
|
|
|
|
|
|
|
} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
|
|
|
|
/* too big */
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
|
|
|
|
} else {
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPDN dn = NULL;
|
2001-12-28 15:27:15 +08:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
pretty->bv_val = NULL;
|
|
|
|
normal->bv_val = NULL;
|
|
|
|
pretty->bv_len = 0;
|
|
|
|
normal->bv_len = 0;
|
|
|
|
|
|
|
|
/* FIXME: should be liberal in what we accept */
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_bv2dn_x( val, &dn, LDAP_DN_FORMAT_LDAP, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2002-02-14 00:41:41 +08:00
|
|
|
assert( strlen( val->bv_val ) == val->bv_len );
|
|
|
|
|
2001-12-28 15:27:15 +08:00
|
|
|
/*
|
|
|
|
* Schema-aware rewrite
|
|
|
|
*/
|
2003-04-11 09:29:28 +08:00
|
|
|
if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY, ctx ) != LDAP_SUCCESS ) {
|
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_dn2bv_x( dn, pretty,
|
|
|
|
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
2003-04-11 09:29:28 +08:00
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
if ( LDAPDN_rewrite( dn, 0, ctx ) != LDAP_SUCCESS ) {
|
|
|
|
ldap_dnfree_x( dn, ctx );
|
|
|
|
ber_memfree_x( pretty->bv_val, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
pretty->bv_val = NULL;
|
|
|
|
pretty->bv_len = 0;
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_dn2bv_x( dn, normal,
|
|
|
|
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
ldap_dnfree_x( dn, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
2003-04-11 09:29:28 +08:00
|
|
|
ber_memfree_x( pretty->bv_val, ctx );
|
2001-12-28 15:27:15 +08:00
|
|
|
pretty->bv_val = NULL;
|
|
|
|
pretty->bv_len = 0;
|
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "<<< dnPrettyNormal: <%s>, <%s>\n",
|
2007-09-01 21:35:34 +08:00
|
|
|
pretty->bv_val ? pretty->bv_val : "",
|
|
|
|
normal->bv_val ? normal->bv_val : "", 0 );
|
2001-12-28 15:27:15 +08:00
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
/*
|
2001-12-24 14:00:02 +08:00
|
|
|
* dnMatch routine
|
2001-12-23 09:19:46 +08:00
|
|
|
*/
|
|
|
|
int
|
|
|
|
dnMatch(
|
|
|
|
int *matchp,
|
|
|
|
slap_mask_t flags,
|
|
|
|
Syntax *syntax,
|
|
|
|
MatchingRule *mr,
|
|
|
|
struct berval *value,
|
|
|
|
void *assertedValue )
|
|
|
|
{
|
|
|
|
int match;
|
|
|
|
struct berval *asserted = (struct berval *) assertedValue;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( matchp != NULL );
|
|
|
|
assert( value != NULL );
|
|
|
|
assert( assertedValue != NULL );
|
2004-07-19 05:34:01 +08:00
|
|
|
assert( !BER_BVISNULL( value ) );
|
|
|
|
assert( !BER_BVISNULL( asserted ) );
|
2001-12-23 09:19:46 +08:00
|
|
|
|
|
|
|
match = value->bv_len - asserted->bv_len;
|
|
|
|
|
|
|
|
if ( match == 0 ) {
|
2002-02-14 03:18:31 +08:00
|
|
|
match = memcmp( value->bv_val, asserted->bv_val,
|
|
|
|
value->bv_len );
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
|
|
|
|
match, value->bv_val, asserted->bv_val );
|
2001-12-08 14:57:06 +08:00
|
|
|
|
2001-12-23 09:19:46 +08:00
|
|
|
*matchp = match;
|
2004-09-09 10:07:27 +08:00
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* dnRelativeMatch routine
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
dnRelativeMatch(
|
|
|
|
int *matchp,
|
|
|
|
slap_mask_t flags,
|
|
|
|
Syntax *syntax,
|
|
|
|
MatchingRule *mr,
|
|
|
|
struct berval *value,
|
|
|
|
void *assertedValue )
|
|
|
|
{
|
|
|
|
int match;
|
|
|
|
struct berval *asserted = (struct berval *) assertedValue;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( matchp != NULL );
|
|
|
|
assert( value != NULL );
|
|
|
|
assert( assertedValue != NULL );
|
2004-09-09 10:07:27 +08:00
|
|
|
assert( !BER_BVISNULL( value ) );
|
|
|
|
assert( !BER_BVISNULL( asserted ) );
|
|
|
|
|
|
|
|
if( mr == slap_schema.si_mr_dnSubtreeMatch ) {
|
|
|
|
if( asserted->bv_len > value->bv_len ) {
|
|
|
|
match = -1;
|
|
|
|
} else if ( asserted->bv_len == value->bv_len ) {
|
|
|
|
match = memcmp( value->bv_val, asserted->bv_val,
|
|
|
|
value->bv_len );
|
|
|
|
} else {
|
|
|
|
if( DN_SEPARATOR(
|
|
|
|
value->bv_val[value->bv_len - asserted->bv_len - 1] ))
|
|
|
|
{
|
|
|
|
match = memcmp(
|
|
|
|
&value->bv_val[value->bv_len - asserted->bv_len],
|
|
|
|
asserted->bv_val,
|
|
|
|
asserted->bv_len );
|
|
|
|
} else {
|
2005-08-15 07:08:20 +08:00
|
|
|
match = 1;
|
2004-09-09 10:07:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-09 11:56:58 +08:00
|
|
|
*matchp = match;
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( mr == slap_schema.si_mr_dnSuperiorMatch ) {
|
|
|
|
asserted = value;
|
|
|
|
value = (struct berval *) assertedValue;
|
|
|
|
mr = slap_schema.si_mr_dnSubordinateMatch;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( mr == slap_schema.si_mr_dnSubordinateMatch ) {
|
|
|
|
if( asserted->bv_len >= value->bv_len ) {
|
|
|
|
match = -1;
|
|
|
|
} else {
|
|
|
|
if( DN_SEPARATOR(
|
|
|
|
value->bv_val[value->bv_len - asserted->bv_len - 1] ))
|
|
|
|
{
|
|
|
|
match = memcmp(
|
|
|
|
&value->bv_val[value->bv_len - asserted->bv_len],
|
|
|
|
asserted->bv_val,
|
|
|
|
asserted->bv_len );
|
|
|
|
} else {
|
2005-08-15 07:08:20 +08:00
|
|
|
match = 1;
|
2004-09-09 11:56:58 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*matchp = match;
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( mr == slap_schema.si_mr_dnOneLevelMatch ) {
|
|
|
|
if( asserted->bv_len >= value->bv_len ) {
|
|
|
|
match = -1;
|
|
|
|
} else {
|
|
|
|
if( DN_SEPARATOR(
|
|
|
|
value->bv_val[value->bv_len - asserted->bv_len - 1] ))
|
|
|
|
{
|
|
|
|
match = memcmp(
|
|
|
|
&value->bv_val[value->bv_len - asserted->bv_len],
|
|
|
|
asserted->bv_val,
|
|
|
|
asserted->bv_len );
|
|
|
|
|
|
|
|
if( !match ) {
|
|
|
|
struct berval rdn;
|
|
|
|
rdn.bv_val = value->bv_val;
|
|
|
|
rdn.bv_len = value->bv_len - asserted->bv_len - 1;
|
|
|
|
match = dnIsOneLevelRDN( &rdn ) ? 0 : 1;
|
|
|
|
}
|
|
|
|
} else {
|
2005-08-15 07:08:20 +08:00
|
|
|
match = 1;
|
2004-09-09 11:56:58 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-09 10:07:27 +08:00
|
|
|
*matchp = match;
|
|
|
|
return LDAP_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2004-09-09 11:56:58 +08:00
|
|
|
/* should not be reachable */
|
|
|
|
assert( 0 );
|
2004-09-09 10:07:27 +08:00
|
|
|
return LDAP_OTHER;
|
2001-12-23 09:19:46 +08:00
|
|
|
}
|
|
|
|
|
2004-06-30 07:36:58 +08:00
|
|
|
int
|
|
|
|
rdnMatch(
|
|
|
|
int *matchp,
|
|
|
|
slap_mask_t flags,
|
|
|
|
Syntax *syntax,
|
|
|
|
MatchingRule *mr,
|
|
|
|
struct berval *value,
|
|
|
|
void *assertedValue )
|
|
|
|
{
|
|
|
|
int match;
|
|
|
|
struct berval *asserted = (struct berval *) assertedValue;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( matchp != NULL );
|
|
|
|
assert( value != NULL );
|
|
|
|
assert( assertedValue != NULL );
|
2004-06-30 07:36:58 +08:00
|
|
|
|
|
|
|
match = value->bv_len - asserted->bv_len;
|
|
|
|
|
|
|
|
if ( match == 0 ) {
|
|
|
|
match = memcmp( value->bv_val, asserted->bv_val,
|
|
|
|
value->bv_len );
|
|
|
|
}
|
|
|
|
|
2004-06-30 09:17:05 +08:00
|
|
|
Debug( LDAP_DEBUG_ARGS, "rdnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
|
2004-06-30 07:36:58 +08:00
|
|
|
match, value->bv_val, asserted->bv_val );
|
|
|
|
|
|
|
|
*matchp = match;
|
2004-09-09 10:07:27 +08:00
|
|
|
return LDAP_SUCCESS;
|
2004-06-30 07:36:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-01-18 06:36:53 +08:00
|
|
|
/*
|
|
|
|
* dnParent - dn's parent, in-place
|
|
|
|
* note: the incoming dn is assumed to be normalized/prettyfied,
|
|
|
|
* so that escaped rdn/ava separators are in '\'+hexpair form
|
2005-04-02 07:58:38 +08:00
|
|
|
*
|
|
|
|
* note: "dn" and "pdn" can point to the same berval;
|
|
|
|
* beware that, in this case, the pointer to the original buffer
|
|
|
|
* will get lost.
|
2002-01-18 06:36:53 +08:00
|
|
|
*/
|
2002-01-26 16:44:59 +08:00
|
|
|
void
|
2002-01-18 06:36:53 +08:00
|
|
|
dnParent(
|
2002-01-26 13:27:28 +08:00
|
|
|
struct berval *dn,
|
|
|
|
struct berval *pdn )
|
2002-01-18 06:36:53 +08:00
|
|
|
{
|
2002-01-26 14:52:11 +08:00
|
|
|
char *p;
|
2002-01-18 06:36:53 +08:00
|
|
|
|
2005-11-14 06:26:53 +08:00
|
|
|
p = ber_bvchr( dn, ',' );
|
2002-01-18 06:36:53 +08:00
|
|
|
|
|
|
|
/* one-level dn */
|
|
|
|
if ( p == NULL ) {
|
2002-05-09 07:04:11 +08:00
|
|
|
pdn->bv_len = 0;
|
|
|
|
pdn->bv_val = dn->bv_val + dn->bv_len;
|
2002-01-26 16:44:59 +08:00
|
|
|
return;
|
2002-01-18 06:36:53 +08:00
|
|
|
}
|
|
|
|
|
2004-05-07 17:03:05 +08:00
|
|
|
assert( DN_SEPARATOR( p[ 0 ] ) );
|
2002-01-18 06:36:53 +08:00
|
|
|
p++;
|
|
|
|
|
|
|
|
assert( ATTR_LEADCHAR( p[ 0 ] ) );
|
2002-01-26 13:27:28 +08:00
|
|
|
pdn->bv_len = dn->bv_len - (p - dn->bv_val);
|
2005-03-31 04:18:11 +08:00
|
|
|
pdn->bv_val = p;
|
2002-01-18 06:36:53 +08:00
|
|
|
|
2002-01-26 16:44:59 +08:00
|
|
|
return;
|
2002-01-18 06:36:53 +08:00
|
|
|
}
|
|
|
|
|
2004-09-11 19:05:41 +08:00
|
|
|
/*
|
|
|
|
* dnRdn - dn's rdn, in-place
|
|
|
|
* note: the incoming dn is assumed to be normalized/prettyfied,
|
|
|
|
* so that escaped rdn/ava separators are in '\'+hexpair form
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
dnRdn(
|
|
|
|
struct berval *dn,
|
|
|
|
struct berval *rdn )
|
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
*rdn = *dn;
|
2005-11-14 06:26:53 +08:00
|
|
|
p = ber_bvchr( dn, ',' );
|
2004-09-11 19:05:41 +08:00
|
|
|
|
|
|
|
/* one-level dn */
|
|
|
|
if ( p == NULL ) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert( DN_SEPARATOR( p[ 0 ] ) );
|
|
|
|
assert( ATTR_LEADCHAR( p[ 1 ] ) );
|
|
|
|
rdn->bv_len = p - dn->bv_val;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-12-24 23:48:35 +08:00
|
|
|
int
|
|
|
|
dnExtractRdn(
|
2001-12-28 01:17:01 +08:00
|
|
|
struct berval *dn,
|
2003-04-11 09:29:28 +08:00
|
|
|
struct berval *rdn,
|
|
|
|
void *ctx )
|
2001-12-24 23:48:35 +08:00
|
|
|
{
|
2003-04-11 09:29:28 +08:00
|
|
|
LDAPRDN tmpRDN;
|
2001-12-24 23:48:35 +08:00
|
|
|
const char *p;
|
|
|
|
int rc;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( dn != NULL );
|
|
|
|
assert( rdn != NULL );
|
2001-12-24 23:48:35 +08:00
|
|
|
|
2001-12-28 01:17:01 +08:00
|
|
|
if( dn->bv_len == 0 ) {
|
|
|
|
return LDAP_OTHER;
|
|
|
|
}
|
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
rc = ldap_bv2rdn_x( dn, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP, ctx );
|
2001-12-24 23:48:35 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2004-09-09 10:07:27 +08:00
|
|
|
rc = ldap_rdn2bv_x( tmpRDN, rdn, LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY,
|
|
|
|
ctx );
|
2002-08-19 15:07:25 +08:00
|
|
|
|
2003-04-11 09:29:28 +08:00
|
|
|
ldap_rdnfree_x( tmpRDN, ctx );
|
2004-09-09 10:07:27 +08:00
|
|
|
return rc;
|
2001-12-24 23:48:35 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-01-26 13:27:28 +08:00
|
|
|
* We can assume the input is a prettied or normalized DN
|
2001-12-24 23:48:35 +08:00
|
|
|
*/
|
2005-09-11 02:59:35 +08:00
|
|
|
ber_len_t
|
2001-12-24 23:48:35 +08:00
|
|
|
dn_rdnlen(
|
|
|
|
Backend *be,
|
2001-12-28 16:38:24 +08:00
|
|
|
struct berval *dn_in )
|
1999-01-29 05:40:04 +08:00
|
|
|
{
|
2001-12-28 23:13:16 +08:00
|
|
|
const char *p;
|
2001-12-24 23:48:35 +08:00
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( dn_in != NULL );
|
2001-12-24 23:48:35 +08:00
|
|
|
|
|
|
|
if ( dn_in == NULL ) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-12-28 16:38:24 +08:00
|
|
|
if ( !dn_in->bv_len ) {
|
2001-12-24 23:48:35 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-01-26 13:27:28 +08:00
|
|
|
if ( be != NULL && be_issuffix( be, dn_in ) ) {
|
2001-12-24 23:48:35 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-11-14 06:26:53 +08:00
|
|
|
p = ber_bvchr( dn_in, ',' );
|
2001-12-24 23:48:35 +08:00
|
|
|
|
2008-10-13 18:18:15 +08:00
|
|
|
return p ? (ber_len_t) (p - dn_in->bv_val) : dn_in->bv_len;
|
1999-01-29 05:40:04 +08:00
|
|
|
}
|
|
|
|
|
2001-07-06 20:22:01 +08:00
|
|
|
|
2001-12-27 15:13:13 +08:00
|
|
|
/* rdnValidate:
|
2001-07-22 07:45:04 +08:00
|
|
|
*
|
2001-12-27 15:13:13 +08:00
|
|
|
* LDAP_SUCCESS if rdn is a legal rdn;
|
|
|
|
* LDAP_INVALID_SYNTAX otherwise (including a sequence of rdns)
|
2001-07-05 16:40:40 +08:00
|
|
|
*/
|
|
|
|
int
|
2004-06-30 07:36:58 +08:00
|
|
|
rdn_validate( struct berval *rdn )
|
1999-07-23 01:14:42 +08:00
|
|
|
{
|
2001-12-27 15:13:13 +08:00
|
|
|
#if 1
|
|
|
|
/* Major cheat!
|
|
|
|
* input is a pretty or normalized DN
|
|
|
|
* hence, we can just search for ','
|
|
|
|
*/
|
2002-02-14 02:11:52 +08:00
|
|
|
if( rdn == NULL || rdn->bv_len == 0 ||
|
|
|
|
rdn->bv_len > SLAP_LDAPDN_MAXLEN )
|
|
|
|
{
|
2001-12-27 15:13:13 +08:00
|
|
|
return LDAP_INVALID_SYNTAX;
|
|
|
|
}
|
2005-11-14 06:26:53 +08:00
|
|
|
return ber_bvchr( rdn, ',' ) == NULL
|
2001-12-27 15:13:13 +08:00
|
|
|
? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
|
|
|
|
|
|
|
|
#else
|
2001-12-25 02:42:51 +08:00
|
|
|
LDAPRDN *RDN, **DN[ 2 ] = { &RDN, NULL };
|
|
|
|
const char *p;
|
|
|
|
int rc;
|
2001-07-05 16:40:40 +08:00
|
|
|
|
2001-12-25 02:42:51 +08:00
|
|
|
/*
|
|
|
|
* must be non-empty
|
|
|
|
*/
|
|
|
|
if ( rdn == NULL || rdn == '\0' ) {
|
|
|
|
return 0;
|
2001-07-05 16:40:40 +08:00
|
|
|
}
|
|
|
|
|
2001-12-25 02:42:51 +08:00
|
|
|
/*
|
|
|
|
* must be parsable
|
|
|
|
*/
|
2002-02-13 19:46:33 +08:00
|
|
|
rc = ldap_bv2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
|
2001-12-25 02:42:51 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
return 0;
|
2001-07-05 16:40:40 +08:00
|
|
|
}
|
|
|
|
|
2001-12-25 02:42:51 +08:00
|
|
|
/*
|
|
|
|
* Must be one-level
|
|
|
|
*/
|
|
|
|
if ( p[ 0 ] != '\0' ) {
|
|
|
|
return 0;
|
2001-07-05 16:40:40 +08:00
|
|
|
}
|
|
|
|
|
2001-12-25 02:42:51 +08:00
|
|
|
/*
|
|
|
|
* Schema-aware validate
|
|
|
|
*/
|
|
|
|
if ( rc == LDAP_SUCCESS ) {
|
|
|
|
rc = LDAPDN_validate( DN );
|
2001-07-05 16:40:40 +08:00
|
|
|
}
|
2001-12-25 02:42:51 +08:00
|
|
|
ldap_rdnfree( RDN );
|
2001-07-05 16:40:40 +08:00
|
|
|
|
2001-12-25 02:42:51 +08:00
|
|
|
/*
|
|
|
|
* Must validate (there's a repeated parsing ...)
|
|
|
|
*/
|
|
|
|
return ( rc == LDAP_SUCCESS );
|
2001-12-27 15:13:13 +08:00
|
|
|
#endif
|
1999-07-23 01:14:42 +08:00
|
|
|
}
|
1999-03-25 04:26:43 +08:00
|
|
|
|
|
|
|
|
|
|
|
/* build_new_dn:
|
|
|
|
*
|
2006-04-12 02:56:11 +08:00
|
|
|
* Used by back-bdb back_modrdn to create the new dn of entries being
|
1999-03-25 04:26:43 +08:00
|
|
|
* renamed.
|
|
|
|
*
|
2001-12-25 02:42:51 +08:00
|
|
|
* new_dn = parent (p_dn) + separator + rdn (newrdn) + null.
|
1999-03-25 04:26:43 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2001-12-27 08:58:14 +08:00
|
|
|
build_new_dn( struct berval * new_dn,
|
|
|
|
struct berval * parent_dn,
|
2003-09-24 12:30:41 +08:00
|
|
|
struct berval * newrdn,
|
|
|
|
void *memctx )
|
1999-03-25 04:26:43 +08:00
|
|
|
{
|
2001-12-27 00:25:18 +08:00
|
|
|
char *ptr;
|
1999-03-25 05:45:15 +08:00
|
|
|
|
2004-02-26 10:58:12 +08:00
|
|
|
if ( parent_dn == NULL || parent_dn->bv_len == 0 ) {
|
2006-03-31 19:15:26 +08:00
|
|
|
ber_dupbv_x( new_dn, newrdn, memctx );
|
2001-07-22 07:45:04 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-12-27 08:58:14 +08:00
|
|
|
new_dn->bv_len = parent_dn->bv_len + newrdn->bv_len + 1;
|
2004-04-20 11:44:57 +08:00
|
|
|
new_dn->bv_val = (char *) slap_sl_malloc( new_dn->bv_len + 1, memctx );
|
1999-03-25 04:26:43 +08:00
|
|
|
|
2004-11-29 12:03:56 +08:00
|
|
|
ptr = lutil_strncopy( new_dn->bv_val, newrdn->bv_val, newrdn->bv_len );
|
2001-12-27 00:25:18 +08:00
|
|
|
*ptr++ = ',';
|
2001-12-27 08:58:14 +08:00
|
|
|
strcpy( ptr, parent_dn->bv_val );
|
1999-07-23 01:14:42 +08:00
|
|
|
}
|
2001-12-24 12:39:15 +08:00
|
|
|
|
2001-12-24 14:00:02 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* dnIsSuffix - tells whether suffix is a suffix of dn.
|
|
|
|
* Both dn and suffix must be normalized.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
dnIsSuffix(
|
|
|
|
const struct berval *dn,
|
|
|
|
const struct berval *suffix )
|
|
|
|
{
|
|
|
|
int d = dn->bv_len - suffix->bv_len;
|
|
|
|
|
2005-07-18 14:22:33 +08:00
|
|
|
assert( dn != NULL );
|
|
|
|
assert( suffix != NULL );
|
2001-12-24 14:00:02 +08:00
|
|
|
|
|
|
|
/* empty suffix matches any dn */
|
|
|
|
if ( suffix->bv_len == 0 ) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* suffix longer than dn */
|
|
|
|
if ( d < 0 ) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no rdn separator or escaped rdn separator */
|
2004-05-07 17:03:05 +08:00
|
|
|
if ( d > 1 && !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) ) {
|
2001-12-24 14:00:02 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no possible match or malformed dn */
|
|
|
|
if ( d == 1 ) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* compare */
|
|
|
|
return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
|
|
|
|
}
|
2002-04-16 16:46:25 +08:00
|
|
|
|
2004-08-24 17:29:11 +08:00
|
|
|
int
|
|
|
|
dnIsOneLevelRDN( struct berval *rdn )
|
|
|
|
{
|
|
|
|
ber_len_t len = rdn->bv_len;
|
|
|
|
for ( ; len--; ) {
|
|
|
|
if ( DN_SEPARATOR( rdn->bv_val[ len ] ) ) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-09-20 12:06:25 +08:00
|
|
|
#ifdef HAVE_TLS
|
2004-09-20 11:52:39 +08:00
|
|
|
static SLAP_CERT_MAP_FN *DNX509PeerNormalizeCertMap = NULL;
|
2004-09-20 12:06:25 +08:00
|
|
|
#endif
|
2004-09-20 11:52:39 +08:00
|
|
|
|
|
|
|
int register_certificate_map_function(SLAP_CERT_MAP_FN *fn)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_TLS
|
|
|
|
if ( DNX509PeerNormalizeCertMap == NULL ) {
|
|
|
|
DNX509PeerNormalizeCertMap = fn;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-04-16 16:46:25 +08:00
|
|
|
/*
|
2002-04-18 20:26:36 +08:00
|
|
|
* Convert an X.509 DN into a normalized LDAP DN
|
2002-04-16 16:46:25 +08:00
|
|
|
*/
|
|
|
|
int
|
2002-04-18 20:26:36 +08:00
|
|
|
dnX509normalize( void *x509_name, struct berval *out )
|
2002-04-16 16:46:25 +08:00
|
|
|
{
|
2002-04-18 20:26:36 +08:00
|
|
|
/* Invoke the LDAP library's converter with our schema-rewriter */
|
2003-10-18 06:38:19 +08:00
|
|
|
int rc = ldap_X509dn2bv( x509_name, out, LDAPDN_rewrite, 0 );
|
|
|
|
|
|
|
|
Debug( LDAP_DEBUG_TRACE,
|
2006-08-18 01:37:46 +08:00
|
|
|
"dnX509Normalize: <%s> (%d)\n",
|
|
|
|
BER_BVISNULL( out ) ? "(null)" : out->bv_val, rc, 0 );
|
2003-10-18 06:38:19 +08:00
|
|
|
|
|
|
|
return rc;
|
2002-04-18 20:26:36 +08:00
|
|
|
}
|
2002-04-16 16:46:25 +08:00
|
|
|
|
2007-05-21 06:48:21 +08:00
|
|
|
#ifdef HAVE_TLS
|
2002-04-18 20:26:36 +08:00
|
|
|
/*
|
|
|
|
* Get the TLS session's peer's DN into a normalized LDAP DN
|
|
|
|
*/
|
2002-04-30 21:52:49 +08:00
|
|
|
int
|
|
|
|
dnX509peerNormalize( void *ssl, struct berval *dn )
|
2002-04-18 20:26:36 +08:00
|
|
|
{
|
2004-09-20 11:52:39 +08:00
|
|
|
int rc = LDAP_INVALID_CREDENTIALS;
|
|
|
|
|
|
|
|
if ( DNX509PeerNormalizeCertMap != NULL )
|
|
|
|
rc = (*DNX509PeerNormalizeCertMap)( ssl, dn );
|
|
|
|
|
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
rc = ldap_pvt_tls_get_peer_dn( ssl, dn,
|
|
|
|
(LDAPDN_rewrite_dummy *)LDAPDN_rewrite, 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2002-04-16 16:46:25 +08:00
|
|
|
}
|
2002-04-19 09:25:15 +08:00
|
|
|
#endif
|