[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ca8c25a Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
       via  8119926 Revert "Add a missing include file to two VFS modules"
      from  5494856 s3:smbd: disconnect the socket if we got an unexpected request

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


- Log -----------------------------------------------------------------
commit ca8c25abebb8715176f68be9916217db9a8400dd
Author: David Disseldorp <ddiss at suse.de>
Date:   Fri Sep 23 11:46:06 2011 -0700

    Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Sep 23 22:20:55 CEST 2011 on sn-devel-104

commit 8119926b3a13e261018a3f7b09cae5baf3abd30a
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 15 15:55:30 2011 -0700

    Revert "Add a missing include file to two VFS modules"
    
    My mistake - should have been 3.6.x only.
    
    This reverts commit 2e4d0641950ce6e38724ca71b46cf925f51ac7be.

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

Summary of changes:
 source3/modules/gpfs.c           |    1 -
 source3/modules/vfs_acl_common.c |    2 +-
 source3/modules/vfs_prealloc.c   |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 52a9331..5b0d7d0 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-#include "system/filesys.h"
 
 #ifdef HAVE_GPFS
 
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 9a1d13b..2ed3cac 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -253,7 +253,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle,
 			        uint32_t security_info,
 				struct security_descriptor **ppdesc)
 {
-	DATA_BLOB blob;
+	DATA_BLOB blob = data_blob_null;
 	NTSTATUS status;
 	uint16_t hash_type = XATTR_SD_HASH_TYPE_NONE;
 	uint8_t hash[XATTR_SD_HASH_SIZE];
diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
index 73f1a93..fb2e46e 100644
--- a/source3/modules/vfs_prealloc.c
+++ b/source3/modules/vfs_prealloc.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-#include "system/filesys.h"
 
 /* Extent preallocation module.
  *


-- 
Samba Shared Repository