The branch, master has been updated
via 77820d5 s3-test: disable ktest for now
via 5f771b3 ldb: fixed --paged option in ldb tools
from 2db094f Fix bug 6966 - "allow trusted domains = no" not respected
in winbind.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 77820d59fe517168db5cb79b05214ae9fd6b4467
Author: Andrew Tridgell <[email protected]>
Date: Thu Apr 7 10:51:23 2011 +1000
s3-test: disable ktest for now
the ktest tests are currently flakey. Once andrew has found the
problem they can be re-enabled
Autobuild-User: Andrew Tridgell <[email protected]>
Autobuild-Date: Thu Apr 7 03:36:36 CEST 2011 on sn-devel-104
commit 5f771b301dbb813319ed3aecf5a6b72ed034549a
Author: Andrew Tridgell <[email protected]>
Date: Thu Apr 7 09:35:58 2011 +1000
ldb: fixed --paged option in ldb tools
we were sometimes using 'paged_result' and sometimes using 'paged_results'.
The latter seemed to be more common, so I changed the two places that
used the 'paged_result' string to 'paged_results'
-----------------------------------------------------------------------
Summary of changes:
source3/selftest/knownfail | 1 +
source4/dsdb/tests/python/ldap.py | 2 +-
source4/lib/ldb/include/ldb.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index 95f01f6..d97bed2 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -12,3 +12,4 @@ samba3.posix_s3.nbt.dgram.*netlogon2
samba3.*rap.sam.*.useradd # Not provided by Samba 3
samba3.*rap.sam.*.userdelete # Not provided by Samba 3
samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3
+samba3.*ktest # ktest is currently flakey due to name resolution issues
diff --git a/source4/dsdb/tests/python/ldap.py
b/source4/dsdb/tests/python/ldap.py
index a49dbf0..4f2044b 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2655,7 +2655,7 @@ nTSecurityDescriptor:: """ + desc_base64
"""Testing that if we request a control that return a control it
really return something"""
res = self.ldb.search(attrs=["cn"],
- controls=["paged_result:1:10"])
+ controls=["paged_results:1:10"])
self.assertEquals(len(res.controls), 1)
self.assertEquals(res.controls[0].oid, "1.2.840.113556.1.4.319")
try:
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 49f8222..f5d5940 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -532,7 +532,7 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void
*opaque);
\sa <a href="http://www.ietf.org/rfc/rfc2696.txt";>RFC 2696</a>.
*/
#define LDB_CONTROL_PAGED_RESULTS_OID "1.2.840.113556.1.4.319"
-#define LDB_CONTROL_PAGED_RESULTS_NAME "paged_result"
+#define LDB_CONTROL_PAGED_RESULTS_NAME "paged_results"
/**
OID for specifying the returned elements of the ntSecurityDescriptor
--
Samba Shared Repository
