[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  46cc0b2 libsmbconf: parse an empty share as empty share, not as NULL.
      from  aaa19fa tdb: fix non-WAF build, commit 1.2.6 ABI file.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 46cc0b24a81e77772caa3697e53c24ecb8c6fcf5
Author: Michael Adam <obnox at 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 <gbeck at sernet.de> for reporting.
    (cherry picked from commit 84127dd50420a7d0e8f389d4af15d52fca6cd809)

-----------------------------------------------------------------------

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