The branch, master has been updated
via 69e1f3d net: Fix messaging_init for clustering
via 04c6879 ctdbd_conn: Fix a leak on talloc_tos()
via 1c9ff50 source/libsmb: Fix CID 1272955 Logically dead code
via b4db69f source3/registry: Fix CID 1273100 Stray semicolon
via d201e94 source3/registry: Fix CID 1273421 Useless call
from 4ddf78a tdb: version 1.3.6
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 69e1f3d6f062a1d6cd014bd2e3f0608e1c86789b
Author: Volker Lendecke <v...@samba.org>
Date: Mon Jun 15 12:14:43 2015 +0000
net: Fix messaging_init for clustering
A full loadparm with include=registry implicitly initializes a
messaging_context. We need to use that.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
Autobuild-User(master): Michael Adam <ob...@samba.org>
Autobuild-Date(master): Mon Jun 15 22:44:57 CEST 2015 on sn-devel-104
commit 04c6879b9b3fa9a83d9d55c9088a506385b2f290
Author: Volker Lendecke <v...@samba.org>
Date: Mon Jun 15 14:47:50 2015 +0000
ctdbd_conn: Fix a leak on talloc_tos()
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
commit 1c9ff5089105a708b3277fcfa0891aff41aae056
Author: Anoop C S <achir...@redhat.com>
Date: Mon Jun 15 15:03:19 2015 +0530
source/libsmb: Fix CID 1272955 Logically dead code
Signed-off-by: Anoop C S <achir...@redhat.com>
Reviewed-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
commit b4db69f0dedd5485dcee28f1ffc3e194a5b1db88
Author: Anoop C S <achir...@redhat.com>
Date: Mon Jun 15 14:58:46 2015 +0530
source3/registry: Fix CID 1273100 Stray semicolon
Signed-off-by: Anoop C S <achir...@redhat.com>
Reviewed-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
commit d201e94f5b5c519a280f5c2306470cb39c26833f
Author: Anoop C S <achir...@redhat.com>
Date: Mon Jun 15 14:40:00 2015 +0530
source3/registry: Fix CID 1273421 Useless call
Signed-off-by: Anoop C S <achir...@redhat.com>
Reviewed-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/ctdbd_conn.c | 3 +++
source3/libsmb/namequery.c | 4 ----
source3/registry/reg_perfcount.c | 2 --
source3/registry/regfio.c | 2 +-
source3/utils/net.c | 23 +++++++++++++++++------
5 files changed, 21 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9ad58fe..7a95b79c 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -597,6 +597,9 @@ static void ctdbd_socket_handler(struct tevent_context
*event_ctx,
}
status = ctdb_handle_message(conn, hdr);
+
+ TALLOC_FREE(hdr);
+
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("could not handle incoming message: %s\n",
nt_errstr(status)));
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index e900934..07c58fc 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3117,10 +3117,6 @@ static NTSTATUS get_dc_list(const char *domain,
*ordered = true;
resolve_order = kdc_order;
}
- if (!resolve_order) {
- status = NT_STATUS_NO_MEMORY;
- goto out;
- }
/* fetch the server we have affinity for. Add the
'password server' list to a search for our domain controllers */
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index 0770f21..997701d 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -1143,8 +1143,6 @@ static uint32_t
reg_perfcount_get_perf_data_block(uint32_t base_index,
return 0;
}
- reg_perfcount_get_last_counter(base_index);
-
retval = _reg_perfcount_assemble_global(block, mem_ctx, base_index,
names);
buffer_size = _reg_perfcount_perf_data_block_fixup(block, mem_ctx);
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 5de2901..c895bc4 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -224,7 +224,7 @@ static bool hbin_block_close( REGF_FILE *file, REGF_HBIN
*hbin )
/* remove the block from the open list and flush it to disk */
for ( p=file->block_list; p && p!=hbin; p=p->next )
- ;;
+ ;
if ( p == hbin ) {
DLIST_REMOVE( file->block_list, hbin );
diff --git a/source3/utils/net.c b/source3/utils/net.c
index ceaf5da..4a8fad1 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -889,7 +889,23 @@ static struct functable net_func[] = {
}
}
- lp_load_global(get_dyn_CONFIGFILE());
+ if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
+ d_fprintf(stderr, "Can't load %s - run testparm to debug it\n",
+ get_dyn_CONFIGFILE());
+ exit(1);
+ }
+
+ /*
+ * Failing to init the msg_ctx isn't a fatal error. Only root-level
+ * things (joining/leaving domains etc.) will be denied.
+ */
+ c->msg_ctx = messaging_init(c, samba_tevent_context_init(c));
+
+ if (!lp_load_global(get_dyn_CONFIGFILE())) {
+ d_fprintf(stderr, "Can't load %s - run testparm to debug it\n",
+ get_dyn_CONFIGFILE());
+ exit(1);
+ }
#if defined(HAVE_BIND_TEXTDOMAIN_CODESET)
/* Bind our gettext results to 'unix charset'
@@ -953,11 +969,6 @@ static struct functable net_func[] = {
popt_burn_cmdline_password(argc, argv);
- /* Failing to init the msg_ctx isn't a fatal error. Only
- root-level things (joining/leaving domains etc.) will be denied. */
-
- c->msg_ctx = messaging_init(c, samba_tevent_context_init(c));
-
rc = net_run_function(c, argc_new-1, argv_new+1, "net", net_func);
DEBUG(2,("return code = %d\n", rc));
--
Samba Shared Repository
