Use new binary name in merged build.

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 28bdf029f8cd171cc6a6dda81b6ad59070d138d1..53ea76ed90fab54ba440b1e0b2be804e30e73a77 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -158,7 +158,7 @@ clean::
 proto:: $(PROTO_HEADERS)
 modules:: $(PLUGINS)
 
-all:: basics bin/smbd4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
+all:: basics bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
 torture:: basics bin/smbtorture4
 everything:: basics $(patsubst %,%4,$(BINARIES))
 

diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c
index 74a59355aab7b68d76961fae64ba5d4ad16c8a39..c15fd2b9ae6f29b6ab003cd9a3dc557cef38a5ac 100644 (file)
--- a/source4/lib/ldb/ldb_wrap.c
+++ b/source4/lib/ldb/ldb_wrap.c
@@ -3204,8 +3204,7 @@ SWIGINTERN PyObject *ldb_schema_format_value(ldb *self,char const *element_name,
                return ret;
         }
 SWIGINTERN ldb_error ldb___contains__(ldb *self,ldb_dn *dn,struct ldb_result **result_as_bool){
-            return ldb_search(self, self, result_as_bool,
-                             dn, LDB_SCOPE_BASE, NULL, NULL);
+            return ldb_search(self, self, result_as_bool, dn, LDB_SCOPE_BASE, NULL, NULL);
         }
 SWIGINTERN PyObject *ldb_parse_ldif(ldb *self,char const *s){
             PyObject *list = PyList_New(0);