The branch, master has been updated
via b19283c param: avoid dereferencing null lp_ctx
via 9d5fba1 param: remove unimplemented find_service() check
from 21974a9 ctdb-build: popt has moved from lib/ to third_party/
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b19283c0f4cd8e54ff1eef9522fdb420136f5291
Author: David Disseldorp <dd...@samba.org>
Date: Mon Aug 11 17:51:58 2014 +0200
param: avoid dereferencing null lp_ctx
process_smbconf_service() calls lp_do_section() with a NULL userdata
(struct loadparm_context *) argument. Since 0864d4945, lp_do_section()
unconditionally attempts to set the lp_ctx->bInGlobalSection variable,
resulting in a segfault.
Signed-off-by: David Disseldorp <dd...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
Autobuild-User(master): David Disseldorp <dd...@samba.org>
Autobuild-Date(master): Mon Aug 11 21:00:15 CEST 2014 on sn-devel-104
commit 9d5fba18ab77c589013e399810bccdc465b6f708
Author: David Disseldorp <dd...@samba.org>
Date: Mon Aug 11 17:29:27 2014 +0200
param: remove unimplemented find_service() check
Check for "default VFS service" is empty, and we don't currently provide
such a feature.
Signed-off-by: David Disseldorp <dd...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 4 +++-
source3/param/service.c | 4 ----
2 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c428c23..94d3b8d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2584,7 +2584,9 @@ bool lp_do_section(const char *pszSectionName, void
*userdata)
/* if we've just struck a global section, note the fact. */
bInGlobalSection = isglobal;
- lp_ctx->bInGlobalSection = isglobal;
+ if (lp_ctx != NULL) {
+ lp_ctx->bInGlobalSection = isglobal;
+ }
/* check for multiple global sections */
if (bInGlobalSection) {
diff --git a/source3/param/service.c b/source3/param/service.c
index 85047a8..473fc82 100644
--- a/source3/param/service.c
+++ b/source3/param/service.c
@@ -180,10 +180,6 @@ int find_service(TALLOC_CTX *ctx, const char *service_in,
char **p_service_out)
}
}
- /* Check for default vfs service? Unsure whether to implement this */
- if (iService < 0) {
- }
-
if (iService < 0) {
iService = load_registry_service(*p_service_out);
}
--
Samba Shared Repository
