From: Howard Chu <hyc@openldap.org>
Date: Thu, 21 Apr 2005 07:15:02 +0000 (+0000)
Subject: Fix dnattr unparsing
X-Git-Tag: OPENLDAP_AC_BP~856
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f5e36e1bbd5da12a73d4cec4dd7b36b2ef3d6d8c;p=openldap

Fix dnattr unparsing
---

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 5a7184a25e..b0bed6579c 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2323,16 +2323,6 @@ dnaccess2text( slap_dn_access *bdn, char *ptr, int is_realdn )
 		ptr = lutil_strcopy( ptr, bdn->a_pat.bv_val );
 		*ptr++ = '"';
 	}
-
-	if ( bdn->a_at != NULL ) {
-		*ptr++ = ' ';
-		if ( is_realdn ) {
-			ptr = lutil_strcopy( ptr, "real" );
-		}
-		ptr = lutil_strcopy( ptr, "dnattr=" );
-		ptr = lutil_strcopy( ptr, bdn->a_at->ad_cname.bv_val );
-	}
-
 	return ptr;
 }
 
@@ -2346,10 +2336,18 @@ access2text( Access *b, char *ptr )
 	if ( !BER_BVISEMPTY( &b->a_dn_pat ) ) {
 		ptr = dnaccess2text( &b->a_dn, ptr, 0 );
 	}
+	if ( b->a_dn_at ) {
+		ptr = lutil_strcopy( ptr, " dnattr=" );
+		ptr = lutil_strcopy( ptr, b->a_dn_at->ad_cname.bv_val );
+	}
 
 	if ( !BER_BVISEMPTY( &b->a_realdn_pat ) ) {
 		ptr = dnaccess2text( &b->a_realdn, ptr, 1 );
 	}
+	if ( b->a_realdn_at ) {
+		ptr = lutil_strcopy( ptr, " realdnattr=" );
+		ptr = lutil_strcopy( ptr, b->a_realdn_at->ad_cname.bv_val );
+	}
 
 	if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
 		ptr = lutil_strcopy( ptr, " group/" );