[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  3e2af15 vfs_catia: Fix bug 11827, memleak
       via  8fedb37 vfs_catia: Align loop index with terminator
      from  494da27 examples/smb.conf.default: Fix typo in comment line: sever -> server

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3e2af1568d150de1cb12fef40580f4880ac787ff
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 10 12:51:15 2016 +0200

    vfs_catia: Fix bug 11827, memleak
    
    add_srt should add the mappings to the linked list even if
    mappings==NULL (the default)
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11827
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Mon Apr 11 14:25:59 CEST 2016 on sn-devel-144

commit 8fedb37369f52cdaf99000e5c5d20710d8b881e9
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 10 13:09:29 2016 +0200

    vfs_catia: Align loop index with terminator
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/modules/vfs_catia.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index c5d2b6a..f4c77d9 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -141,6 +141,9 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings)
 
 	ret->snum = snum;
 
+	ret->next = srt_head;
+	srt_head = ret;
+
 	if (mappings) {
 		ret->mappings = (struct char_mappings**) ((unsigned char*) ret +
 		    sizeof(struct share_mapping_entry));
@@ -176,9 +179,6 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings)
 		}
 	}
 
-	ret->next = srt_head;
-	srt_head = ret;
-
 	return ret;
 }
 
@@ -805,7 +805,7 @@ catia_streaminfo(struct vfs_handle_struct *handle,
 {
 	char *mapped_name = NULL;
 	NTSTATUS status;
-	int i;
+	unsigned int i;
 	struct smb_filename *catia_smb_fname = NULL;
 	unsigned int num_streams = 0;
 	struct stream_struct *streams = NULL;


-- 
Samba Shared Repository