upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup AD stuff (ITS#3225)

Browse source
This commit is contained in:
Pierangelo Masarati 2004-07-09 00:14:15 +00:00
parent 3c7a3f78dd
commit 2afdce8334
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/ad.c
View file

@ -46,7 +46,7 @@ static int ad_keystring(
{
ber_len_t i;
if( !AD_CHAR( bv->bv_val[0] ) ) {
if( !AD_LEADCHAR( bv->bv_val[0] ) ) {
return 1;
}
@ -138,13 +138,13 @@ int slap_bv2ad(
assert( *ad == NULL ); /* temporary */
if( bv == NULL || BER_BVISNULL( bv ) || BER_BVISEMPTY( bv ) ) {
*text = "empty attribute description";
*text = "empty AttributeDescription";
return rtn;
}
/* make sure description is IA5 */
if( ad_keystring( bv ) ) {
*text = "attribute description contains inappropriate characters";
*text = "AttributeDescription contains inappropriate characters";
return rtn;
}

4
servers/slapd/slap.h
View file

@ -148,9 +148,9 @@ LDAP_BEGIN_DECL
#define OID_CHAR(c) ( OID_LEADCHAR(c) || OID_SEPARATOR(c) )
#define ATTR_LEADCHAR(c) ( DESC_LEADCHAR(c) || OID_LEADCHAR(c) )
#define ATTR_CHAR(c) ( DESC_CHAR((c)) || (c) == '.' )
#define ATTR_CHAR(c) ( DESC_CHAR((c)) || OID_SEPARATOR(c) )
#define AD_LEADCHAR(c) ( ATTR_CHAR(c) )
#define AD_LEADCHAR(c) ( ATTR_LEADCHAR(c) )
#define AD_CHAR(c) ( ATTR_CHAR(c) || (c) == ';' )
#define SLAP_NUMERIC(c) ( ASCII_DIGIT(c) || ASCII_SPACE(c) )