From: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu, 6 Feb 2025 15:11:02 +0000 (+0300)
Subject: Revert "ldb: User hexchars_upper from replace.h"
X-Git-Tag: archive/raspbian/2%4.22.2+dfsg-1+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1761affac5e8ce1896c490146d550926c6200729;p=samba.git

Revert "ldb: User hexchars_upper from replace.h"

Forwarded: not-needed
Debian-Specific: yes

This reverts commit 542cf01bfe530a83dfbc8a606d182c0a5a622059.

This commit switched ldb code to use hexchars_upper from libreplace,
introducing circular dependency between libraries.  Restore the status-quo.


Gbp-Pq: Name revert-ldb-use-hexchars_upper-from-replace.h.patch
---

diff --git a/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
index 5b8c0f4f..1321f0d8 100644
--- a/lib/ldb/common/ldb_dn.c
+++ b/lib/ldb/common/ldb_dn.c
@@ -232,10 +232,11 @@ static int ldb_dn_escape_internal(char *dst, const char *src, int len)
 		case '\0': {
 			/* any others get \XX form */
 			unsigned char v;
+			const char *hexbytes = "0123456789ABCDEF";
 			v = (const unsigned char)c;
 			*d++ = '\\';
-			*d++ = hexchars_upper[v>>4];
-			*d++ = hexchars_upper[v&0xF];
+			*d++ = hexbytes[v>>4];
+			*d++ = hexbytes[v&0xF];
 			break;
 		}
 		default: