The branch, master has been updated
via e64ffee ldb:tdb backend - cache - remove unused "last_attribute"
structure member
via bbf2870 s4:"ldb_connect" calls - proof for "!= LDB_SUCCESS"
via 6611f0109 s4:torture/rpc/testjoin.c - use a LDB result constant
via aec1bc7 ldb:tools/cmdline.c + tools/ldbtest.c - make use of LDB
result constants
via cc1cf31 s4:repl_meta_data LDB module - quiet a discard const ptr
warning
via d4a06d5 ldb:ldb_controls.c - fix comment indentation
via 3884fec s4:token_group.py python test - fix typos
from df099e6 s3: Avoid a potential 100% CPU loop in winbindd
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e64ffee1c212b6956a993ebb2032f664c0ac5802
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 10 19:41:34 2011 +0200
ldb:tdb backend - cache - remove unused "last_attribute" structure member
Reviewed-by: abartlet
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Fri Apr 29 20:07:27 CEST 2011 on sn-devel-104
commit bbf28703a47fc464a7d5dac25e6a4a6cf96fe3e9
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 10 20:47:18 2011 +0200
s4:"ldb_connect" calls - proof for "!= LDB_SUCCESS"
Reviewed-by: abartlet
commit 6611f0109b73d8c9ff5679e434aa8e354f28608a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 10 20:47:43 2011 +0200
s4:torture/rpc/testjoin.c - use a LDB result constant
Reviewed-by: abartlet
commit aec1bc7febfb8d3b18018e7b5b653210a0d94e93
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 10 19:35:22 2011 +0200
ldb:tools/cmdline.c + tools/ldbtest.c - make use of LDB result constants
Reviewed-by: abartlet
commit cc1cf31e55b455f67d846ebe1fe60d305ae2ca11
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Wed Apr 13 09:14:44 2011 +0200
s4:repl_meta_data LDB module - quiet a discard const ptr warning
commit d4a06d5dac813951cff3f76704199ec5b6dc834c
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Sun Apr 10 19:24:16 2011 +0200
ldb:ldb_controls.c - fix comment indentation
Reviewed-by: abartlet
commit 3884fec3d504af8c4bc9cff1e6c1a540d874ec8c
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Apr 29 19:03:48 2011 +0200
s4:token_group.py python test - fix typos
-----------------------------------------------------------------------
Summary of changes:
source4/dns_server/dlz_bind9.c | 2 +-
source4/dsdb/samdb/ldb_modules/proxy.c | 2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 2 +-
source4/dsdb/tests/python/token_group.py | 4 ++--
source4/lib/ldb/common/ldb_controls.c | 8 ++++----
source4/lib/ldb/ldb_tdb/ldb_cache.c | 3 ---
source4/lib/ldb/ldb_tdb/ldb_tdb.h | 5 -----
source4/lib/ldb/tools/cmdline.c | 2 +-
source4/lib/ldb/tools/ldbtest.c | 2 +-
source4/torture/rpc/testjoin.c | 4 ++--
10 files changed, 13 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index 4399e1c..4873112 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -533,7 +533,7 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname,
}
ret = ldb_connect(state->samdb, options.url, 0, NULL);
- if (ret == -1) {
+ if (ret != LDB_SUCCESS) {
state->log(ISC_LOG_ERROR, "samba_dlz: Failed to connect to %s -
%s",
options.url, ldb_errstring(state->samdb));
result = ISC_R_FAILURE;
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c
b/source4/dsdb/samdb/ldb_modules/proxy.c
index 6fba24f..5f6e56f 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -138,7 +138,7 @@ static int load_proxy_info(struct ldb_module *module)
ldb_set_opaque(proxy->upstream, "credentials", creds);
ret = ldb_connect(proxy->upstream, url, 0, NULL);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "proxy failed to connect to
%s\n", url);
goto failed;
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 646abeb..90933c4 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2488,7 +2488,7 @@ static int replmd_rename_callback(struct ldb_request
*req, struct ldb_reply *are
if (ret == LDB_ERR_REFERRAL) {
struct ldb_dn *olddn = ac->req->op.rename.olddn;
struct loadparm_context *lp_ctx;
- const char *referral;
+ char *referral;
lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),
struct loadparm_context);
diff --git a/source4/dsdb/tests/python/token_group.py
b/source4/dsdb/tests/python/token_group.py
index 62bdbd5..fb7654e 100755
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -78,7 +78,7 @@ class TokenTest(samba.tests.TestCase):
res = self.ldb.search("", scope=ldb.SCOPE_BASE, attrs=["tokenGroups"])
self.assertEquals(len(res), 1)
- print("Geting tokenGroups from rootDSE")
+ print("Getting tokenGroups from rootDSE")
tokengroups = []
for sid in res[0]['tokenGroups']:
tokengroups.append(str(ndr_unpack(samba.dcerpc.security.dom_sid,
sid)))
@@ -93,7 +93,7 @@ class TokenTest(samba.tests.TestCase):
self.fail(msg="calculated groups don't match against rootDSE
tokenGroups")
def test_dn_tokenGroups(self):
- print("Geting tokenGroups from user DN")
+ print("Getting tokenGroups from user DN")
res = self.ldb.search(self.user_sid_dn, scope=ldb.SCOPE_BASE,
attrs=["tokenGroups"])
self.assertEquals(len(res), 1)
diff --git a/source4/lib/ldb/common/ldb_controls.c
b/source4/lib/ldb/common/ldb_controls.c
index 5048b6d..b3ef243 100644
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/source4/lib/ldb/common/ldb_controls.c
@@ -482,10 +482,10 @@ struct ldb_control *ldb_parse_control_from_string(struct
ldb_context *ldb, TALLO
}
/* w2k3 seems to ignore the parameter,
- * but w2k sends a wrong cookie when this value is to
small
- * this would cause looping forever, while getting
- * the same data and same cookie forever
- */
+ * but w2k sends a wrong cookie when this value is to small
+ * this would cause looping forever, while getting
+ * the same data and same cookie forever
+ */
if (max_attrs == 0) max_attrs = 0x0FFFFFFF;
ctrl->oid = LDB_CONTROL_DIRSYNC_OID;
diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c
b/source4/lib/ldb/ldb_tdb/ldb_cache.c
index 697f742..e54ceaa 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c
@@ -345,9 +345,6 @@ int ltdb_cache_load(struct ldb_module *module)
ltdb->check_base = false;
}
- talloc_free(ltdb->cache->last_attribute.name);
- memset(<db->cache->last_attribute, 0,
sizeof(ltdb->cache->last_attribute));
-
talloc_free(ltdb->cache->indexlist);
ltdb_attributes_unload(module); /* calls internally "talloc_free" */
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 33313b0..3d793d2 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -21,11 +21,6 @@ struct ltdb_private {
struct ldb_message *attributes;
bool one_level_indexes;
bool attribute_indexes;
-
- struct {
- char *name;
- int flags;
- } last_attribute;
} *cache;
int in_transaction;
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index b2be54e..c259941 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -297,7 +297,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context
*ldb,
}
/* now connect to the ldb */
- if (ldb_connect(ldb, ret->url, flags, ret->options) != 0) {
+ if (ldb_connect(ldb, ret->url, flags, ret->options) != LDB_SUCCESS) {
fprintf(stderr, "Failed to connect to %s - %s\n",
ret->url, ldb_errstring(ldb));
goto failed;
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index a9d8faf..5270357 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -356,7 +356,7 @@ static void start_test_index(struct ldb_context **ldb)
(*ldb) = ldb_init(options, NULL);
ret = ldb_connect(*ldb, options->url, flags, NULL);
- if (ret != 0) {
+ if (ret != LDB_SUCCESS) {
printf("failed to connect to %s\n", options->url);
exit(LDB_ERR_OPERATIONS_ERROR);
}
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index c4ab0e4..76344e0 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -583,14 +583,14 @@ static NTSTATUS torture_leave_ads_domain(struct
torture_context *torture,
ldb_set_opaque(ldb_ctx, "loadparm", cmdline_lp_ctx);
rtn = ldb_connect(ldb_ctx, remote_ldb_url, 0, NULL);
- if (rtn != 0) {
+ if (rtn != LDB_SUCCESS) {
libnet_r->out.error_string = NULL;
talloc_free(tmp_ctx);
return NT_STATUS_UNSUCCESSFUL;
}
rtn = ldb_delete(ldb_ctx, server_dn);
- if (rtn != 0) {
+ if (rtn != LDB_SUCCESS) {
libnet_r->out.error_string = NULL;
talloc_free(tmp_ctx);
return NT_STATUS_UNSUCCESSFUL;
--
Samba Shared Repository
