Merge branch 'master' of ssh://git.samba.org/data/git/samba

[samba.git] / source4 / lib / ldb / ldb.i

diff --git a/source4/lib/ldb/ldb.i b/source4/lib/ldb/ldb.i
index 35d443e809b3cc78d6e28b34c0483fcf42533517..0f05c1fbab6bfaf66938bb5c0e734ea9d2da96cf 100644 (file)
--- a/source4/lib/ldb/ldb.i
+++ b/source4/lib/ldb/ldb.i
@@ -217,7 +217,7 @@ typedef struct ldb_dn {
                we do it this way... */
             talloc_steal(NULL, ret);
 
                we do it this way... */
             talloc_steal(NULL, ret);
 

-            if (ret == NULL)
+            if (ret == NULL || !ldb_dn_validate(ret))

                 SWIG_exception(SWIG_ValueError, 
                                 "unable to parse dn string");
 fail:
                 SWIG_exception(SWIG_ValueError, 
                                 "unable to parse dn string");
 fail:


@@ -263,7 +263,6 @@ fail:
         {
             char *dn = ldb_dn_get_linearized($self), *ret;
             asprintf(&ret, "Dn('%s')", dn);
         {
             char *dn = ldb_dn_get_linearized($self), *ret;
             asprintf(&ret, "Dn('%s')", dn);

-            talloc_free(dn);

             return ret;
         }
 
             return ret;
         }