The branch, master has been updated
via 2da9d7d130c ldb_kv_search: avoid handling uninitialised dn
via dad98d0334d autobuild: attempt authenticated email if environment
suggests it
via c5f7b07ad28 dsdb/modules: minor comment typos in samba_dsdb
via 927a5e3c9db dsdb mods/extended_dn_store: used the ldb we already
have
via c078ea78287 spell "recursive"
via 7545eff148b perf-tests: rename paged search test for regex
disambiguation
from 60e31c5556d rpc: Convert npa_tstream.c to use tstream_u32_read_send
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2da9d7d130cce12f3da9df60d250345ba2eaa455
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Thu Apr 4 15:08:18 2019 +1300
ldb_kv_search: avoid handling uninitialised dn
If ldb_kv_filter_attrs() fails, we don't know that the dn of filtered_msg
is OK.
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Fri Apr 5 05:46:55 UTC 2019 on sn-devel-144
commit dad98d0334d9363c0f4ef5804a0f82eb7f5400ef
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Wed Apr 3 13:17:17 2019 +1300
autobuild: attempt authenticated email if environment suggests it
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit c5f7b07ad28e18f48badf22df55f0411ebc86ddc
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Mon Apr 1 10:25:28 2019 +1300
dsdb/modules: minor comment typos in samba_dsdb
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 927a5e3c9db28258433da29d4d5c6f17c3e19448
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Thu Mar 28 16:06:56 2019 +1300
dsdb mods/extended_dn_store: used the ldb we already have
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit c078ea782873970e2d355ef055c0678d5a54873a
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Wed Mar 27 15:37:54 2019 +1300
spell "recursive"
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 7545eff148befb753cf55530a03945b27dbf8727
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Thu Apr 4 10:36:37 2019 +1300
perf-tests: rename paged search test for regex disambiguation
We like to use "TESTS=medley" for the old ad_dc_medley.
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/ldb_key_value/ldb_kv_search.c | 9 +++++----
script/autobuild.py | 6 ++++++
selftest/perf_tests.py | 2 +-
source3/rpc_client/cli_winreg.h | 2 +-
source4/dsdb/samdb/ldb_modules/extended_dn_store.c | 2 +-
source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 6 ++++--
source4/dsdb/schema/schema_set.c | 2 +-
7 files changed, 19 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ldb_key_value/ldb_kv_search.c
b/lib/ldb/ldb_key_value/ldb_kv_search.c
index a384ee92367..f77e0ca2fdc 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_search.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_search.c
@@ -678,6 +678,11 @@ static int ldb_kv_search_and_return_base(struct
ldb_kv_private *ldb_kv,
* assignment is safe
*/
ret = ldb_kv_filter_attrs(ctx, msg, ctx->attrs, &filtered_msg);
+ if (ret == -1) {
+ talloc_free(msg);
+ filtered_msg = NULL;
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
/*
* Remove any extended components possibly copied in from
@@ -686,10 +691,6 @@ static int ldb_kv_search_and_return_base(struct
ldb_kv_private *ldb_kv,
ldb_dn_remove_extended_components(filtered_msg->dn);
talloc_free(msg);
- if (ret == -1) {
- return LDB_ERR_OPERATIONS_ERROR;
- }
-
ret = ldb_module_send_entry(ctx->req, filtered_msg, NULL);
if (ret != LDB_SUCCESS) {
/* Regardless of success or failure, the msg
diff --git a/script/autobuild.py b/script/autobuild.py
index d62e721a3cd..0f95cc50bc8 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -910,6 +910,12 @@ def send_email(subject, text, log_tar):
outer.attach(msg)
content = outer.as_string()
s = smtplib.SMTP(options.email_server)
+ email_user = os.getenv('SMTP_USERNAME')
+ email_password = os.getenv('SMTP_PASSWORD')
+ if email_user is not None:
+ s.starttls()
+ s.login(email_user, email_password)
+
s.sendmail(options.email_from, [options.email], content)
s.set_debuglevel(1)
s.quit()
diff --git a/selftest/perf_tests.py b/selftest/perf_tests.py
index a3fdbf4b1b3..484a4b8b972 100644
--- a/selftest/perf_tests.py
+++ b/selftest/perf_tests.py
@@ -92,7 +92,7 @@
plantestsuite_loadlist("samba4.ldap.ad_dc_medley_performance.python(ad_dc_ntvfs)
'$LOADLIST', '$LISTOPT'])
# again with paged search module
-plantestsuite_loadlist("samba4.ldap.ad_dc_medley_performance.paged_search."+\
+plantestsuite_loadlist("samba4.ldap.ad_dc_performance.paged_search."+\
"python(ad_dc_ntvfs)",
"ad_dc_ntvfs",
[python,
diff --git a/source3/rpc_client/cli_winreg.h b/source3/rpc_client/cli_winreg.h
index a5162633db6..b562531ad78 100644
--- a/source3/rpc_client/cli_winreg.h
+++ b/source3/rpc_client/cli_winreg.h
@@ -417,7 +417,7 @@ NTSTATUS dcerpc_winreg_enumvals(TALLOC_CTX *mem_ctx,
/**
* @internal
*
- * @brief A function to delete a key and its subkeys recurively.
+ * @brief A function to delete a key and its subkeys recursively.
*
* @param[in] mem_ctx The memory context to use.
*
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
index 6bfced3b7d2..0b0e1861f97 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
@@ -86,7 +86,7 @@ static struct extended_dn_context
*extended_dn_context_init(struct ldb_module *m
return NULL;
}
- ac->schema = dsdb_get_schema(ldb_module_get_ctx(module), ac);
+ ac->schema = dsdb_get_schema(ldb, ac);
ac->module = module;
ac->ldb = ldb;
ac->req = req;
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index e08891a2fda..95967c33e12 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -600,7 +600,8 @@ static int samba_dsdb_init(struct ldb_module *module)
talloc_steal(ldb, partition_msg);
- /* Now prepare the module chain. Oddly, we must give it to
ldb_load_modules_list in REVERSE */
+ /* Now prepare the module chain. Oddly, we must give it to
+ * ldb_module_load_list in REVERSE */
for (len = 0; final_module_list[len]; len++) { /* noop */};
reverse_module_list = talloc_array(tmp_ctx, const char *, len+1);
@@ -621,7 +622,8 @@ static int samba_dsdb_init(struct ldb_module *module)
CHECK_LDB_RET(ret);
talloc_free(tmp_ctx);
- /* Set this as the 'next' module, so that we effectivly append it to
module chain */
+ /* Set this as the 'next' module, so that we effectively append it to
+ * module chain */
ldb_module_set_next(module, module_chain);
ret = ldb_next_read_lock(module);
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index 8674757f3b0..f9f63330e97 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -741,7 +741,7 @@ struct dsdb_schema *dsdb_get_schema(struct ldb_context
*ldb, TALLOC_CTX *referen
}
if (refresh_fn) {
- /* We need to guard against recurisve calls here */
+ /* We need to guard against recursive calls here */
if (ldb_set_opaque(ldb, "dsdb_schema_refresh_fn", NULL) !=
LDB_SUCCESS) {
ldb_debug_set(ldb, LDB_DEBUG_FATAL,
"dsdb_get_schema: clearing
dsdb_schema_refresh_fn failed");
--
Samba Shared Repository
