diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 04:41:30 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 04:41:30 +0200 |
| commit | 1ca2e4b99fadac78fd9c58ea9ec9973f19659203 (patch) | |
| tree | 8a4dd441158506f0dec16750487e5c09be035dd9 | |
| parent | 4b942c2a7298987bbc596e89197ba76617580221 (diff) | |
| download | samba-1ca2e4b99fadac78fd9c58ea9ec9973f19659203.tar.gz samba-1ca2e4b99fadac78fd9c58ea9ec9973f19659203.tar.bz2 samba-1ca2e4b99fadac78fd9c58ea9ec9973f19659203.zip | |
Use new binary name in merged build.
| -rw-r--r-- | source3/samba4.mk | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_wrap.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index 28bdf029f8..53ea76ed90 100644 --- 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 74a59355aa..c15fd2b9ae 100644 --- 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); |