From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Tue, 9 Mar 2021 11:46:10 +0000 (+0000)
Subject: ITS#5768 Avoid extraneous newlines in deref printing
X-Git-Tag: OPENLDAP_REL_ENG_2_5_3BETA~6^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2e6efed95dd39785f032bcb1d5f4160030136a2;p=thirdparty%2Fopenldap.git

ITS#5768 Avoid extraneous newlines in deref printing
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 1395e69a4a..2a1d303538 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -2285,7 +2285,6 @@ print_deref( LDAP *ld, LDAPControl *ctrl )
 			}
 		}
 		ptr = lutil_strncopy( ptr, dr->derefVal.bv_val, dr->derefVal.bv_len );
-		*ptr++ = '\n';
 		*ptr = '\0';
 		assert( ptr <= buf + len );
 
diff --git a/tests/data/deref.out b/tests/data/deref.out
index d21057354e..e4bc90ad19 100644
--- a/tests/data/deref.out
+++ b/tests/data/deref.out
@@ -31,9 +31,7 @@ uid: ando
 
 dn: cn=Test Group,ou=groups,o=deref
 # member: <uid=hyc>;cn=Howard Chu,ou=users,o=deref
-
 # member: <uid=ando>;cn=Pierangelo Masarati,ou=users,o=deref
-
 objectClass: groupOfNames
 cn: Test Group
 member: cn=Howard Chu,ou=users,o=deref