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/source3/lib/ldb_compat.c b/source3/lib/ldb_compat.c
index 36a29e68332146c251cd32bd153ebd4db0e8aa04..494d381ad1923a7ef7516b7f1babb3f3710cfff0 100644 (file)
--- a/source3/lib/ldb_compat.c
+++ b/source3/lib/ldb_compat.c
@@ -84,8 +84,13 @@ static struct ldb_val ldb_binary_decode(void *mem_ctx, const char *str)
        return ret;
 }
 
-
-
+static bool need_encode(unsigned char cval)
+{
+       if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", cval)) {
+               return true;
+       }
+       return false;
+}
 
 /*
    encode a blob as a RFC2254 binary string, escaping any
@@ -99,7 +104,7 @@ char *ldb_binary_encode(void *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])) {
+               if (need_encode(buf[i])) {
                        len += 2;
                }
        }
@@ -108,7 +113,7 @@ char *ldb_binary_encode(void *mem_ctx, struct ldb_val val)
 
        len = 0;
        for (i=0;i<val.length;i++) {
-               if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+               if (need_encode(buf[i])) {
                        snprintf(ret+len, 4, "\\%02X", buf[i]);
                        len += 3;
                } else {

diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c
index b4eabf8375c085263b16f4129ca9f0bd7ae6bda7..1ea425a89c0e3640f7ca5a01fc154adb3441850a 100644 (file)
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/source4/lib/ldb/common/ldb_parse.c
@@ -111,6 +111,13 @@ struct ldb_val ldb_binary_decode(TALLOC_CTX *mem_ctx, const char *str)
        return ret;
 }
 
+static bool need_encode(unsigned char cval)
+{
+       if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", cval)) {
+               return true;
+       }
+       return false;
+}
 
 /*
    encode a blob as a RFC2254 binary string, escaping any
@@ -124,7 +131,7 @@ 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])) {
+               if (need_encode(buf[i])) {
                        len += 2;
                }
        }
@@ -133,7 +140,7 @@ 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])) {
+               if (need_encode(buf[i])) {
                        snprintf(ret+len, 4, "\\%02X", buf[i]);
                        len += 3;
                } else {