use macros instead of literals

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 0ab9510aef6ce7e74fbab2a001f1ae0e630e63fc..30a4b455f62eb25721d7e250bd471da7ff52d540 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2454,10 +2454,10 @@ access2text( Access *b, char *ptr )
        if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
                ptr = lutil_strcopy( ptr, " group/" );
                ptr = lutil_strcopy( ptr, b->a_group_oc ?
-                       b->a_group_oc->soc_cname.bv_val : "groupOfNames" );
+                       b->a_group_oc->soc_cname.bv_val : SLAPD_GROUP_CLASS );
                *ptr++ = '/';
                ptr = lutil_strcopy( ptr, b->a_group_at ?
-                       b->a_group_at->ad_cname.bv_val : "member" );
+                       b->a_group_at->ad_cname.bv_val : SLAPD_GROUP_ATTR );
                *ptr++ = '.';
                ptr = lutil_strcopy( ptr, style_strings[b->a_group_style] );
                *ptr++ = '=';

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index b1bdf74389dbabe052207956fa20dad5cb91eff9..80300f8c71319261b900f11750832c0b23888c12 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -380,11 +380,11 @@ is_dn:            bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
 
                        } else {
                                group_oc.bv_len = group_dn.bv_val - group_oc.bv_val;
-                               BER_BVSTR( &member_at, "member" );
+                               BER_BVSTR( &member_at, SLAPD_GROUP_ATTR );
                        }
 
                } else {
-                       BER_BVSTR( &group_oc, "groupOfNames" );
+                       BER_BVSTR( &group_oc, SLAPD_GROUP_CLASS );
                }
                group_dn.bv_val++;
                group_dn.bv_len = uri->bv_len - ( group_dn.bv_val - uri->bv_val );