r4010: fixed parsing of null attributes in the ldb ldif parser

(This used to be commit b4fd76f78eadd8648ceed508766235e80702aa8f)

diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c
index bd99468182d77909fdc84acef49b4f4e4d5ac763..94e15805a6677544f7db6975963c946c8c848b08 100644 (file)
--- a/source4/lib/ldb/common/ldb_ldif.c
+++ b/source4/lib/ldb/common/ldb_ldif.c
@@ -128,7 +128,11 @@ int ldb_should_b64_encode(const struct ldb_val *val)
        unsigned int i;
        uint8_t *p = val->data;
 
-       if (val->length == 0 || p[0] == ' ' || p[0] == ':') {
+       if (val->length == 0) {
+               return 0;
+       }
+
+       if (p[0] == ' ' || p[0] == ':') {
                return 1;
        }
 
@@ -377,7 +381,7 @@ static int next_attr(char **s, const char **attr, struct ldb_val *value)
 
        *attr = *s;
 
-       while (isspace(*p)) {
+       while (*p == ' ' || *p == '\t') {
                p++;
        }
 

diff --git a/source4/lib/ldb/tests/init.ldif b/source4/lib/ldb/tests/init.ldif
index a9ed4506fb37408f3b62f2c0b91e38646507a178..3b0eeffe2f1cbbaab61ffedbc6ba5265f757577d 100644 (file)
--- a/source4/lib/ldb/tests/init.ldif
+++ b/source4/lib/ldb/tests/init.ldif
@@ -9,6 +9,7 @@ o: UM
 o: U-M
 o: U of M
 description: The University of Michigan at Ann Arbor
+seeAlso:
 postaladdress: University of Michigan $ 535 W. William St. $ Ann Arbor, MI 481
  09 $ US
 telephonenumber: +1 313 764-1817