cleanup AD stuff (ITS#3225)

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 19a8ca0c554d14e61c135ed8465270bb4ef031ae..0dacb6eb9d0515ea6ccd67a4cce37fda66b8669e 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -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;
        }
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index f1853ee04f3456ee0c7735e208c19b34e355fa71..1951cd983e7887827b0db165cf0ea6ef429c96ad 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -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) )