From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 6 Aug 2005 11:29:08 +0000 (+0000)
Subject: use macros instead of literals
X-Git-Tag: OPENLDAP_AC_BP~93
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=682a1981a14766738a4b4dd6646c46884f12252a;p=openldap

use macros instead of literals
---

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 0ab9510aef..30a4b455f6 100644
--- 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 b1bdf74389..80300f8c71 100644
--- 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 );