The branch, master has been updated
via 84127dd libsmbconf: parse an empty share as empty share, not as
NULL.
from f4f5ad9 s3:registry: proposed aix build fix for reg_parse_internal
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 84127dd50420a7d0e8f389d4af15d52fca6cd809
Author: Michael Adam <ob...@samba.org>
Date: Mon Sep 27 12:43:39 2010 +0200
libsmbconf: parse an empty share as empty share, not as NULL.
This fixes a segfault in net conf import:
Importing a text file with an empty share resulted in a segfault.
Now this creates an empty share in registry config, just as it
should.
Thanks to Gregor Beck <gb...@sernet.de> for reporting.
-----------------------------------------------------------------------
Summary of changes:
lib/smbconf/smbconf_txt.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c
index 37b01df..2114841 100644
--- a/lib/smbconf/smbconf_txt.c
+++ b/lib/smbconf/smbconf_txt.c
@@ -453,11 +453,7 @@ static WERROR smbconf_txt_get_share(struct smbconf_ctx
*ctx,
}
tmp_service->num_params = count;
- if (count > 0) {
- *service = talloc_move(mem_ctx, &tmp_service);
- } else {
- *service = NULL;
- }
+ *service = talloc_move(mem_ctx, &tmp_service);
done:
talloc_free(tmp_ctx);
--
Samba Shared Repository
