Fix bug #9147 - winbind can't fetch user or group info from AD via LDAP

Don't use "isprint" in ldb_binary_encode(). This is locale specific.
Restrict to ASCII only, hex encode everything else.

diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index cfa2959194071d8574a9aeffa34b1683670dcf84..f47ef4337619016451c8c19c622d7dca0e2123b8 100644 (file)
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -124,7 +124,8 @@ char *ldb_binary_encode(TALLOC_CTX *mem_ctx, struct ldb_val val)
        unsigned char *buf = val.data;
 
        for (i=0;i<val.length;i++) {
-               if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+               unsigned int cval = buf[i];
+               if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", buf[i])) {
                        len += 2;
                }
        }
@@ -133,7 +134,8 @@ char *ldb_binary_encode(TALLOC_CTX *mem_ctx, struct ldb_val val)
 
        len = 0;
        for (i=0;i<val.length;i++) {
-               if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+               unsigned int cval = buf[i];
+               if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", buf[i])) {
                        snprintf(ret+len, 4, "\\%02X", buf[i]);
                        len += 3;
                } else {