[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  2058ce2 smbd: make "hide dot files" option work with "store dos attributes = yes"
       via  0fd68d0 librpc: Fix typos
       via  6aaa8b6 lib: Remove ntstatus.h from gencache.h
      from  4767291 vfs_glusterfs: Attach missing destructor.

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


- Log -----------------------------------------------------------------
commit 2058ce246ea5008202e737f64fbdd9b586b2d7d4
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Dec 15 13:13:02 2015 +0100

    smbd: make "hide dot files" option work with "store dos attributes = yes"
    
    When using "store dos attributes = yes", the function that reads the
    attributes from the xattr get_ea_dos_attribute() will overwrite the
    attribute previously set for "hide dot files".
    
    According to smb.conf, "store dos attributes = yes" should only
    overwrite the "map XXX" options, but not "hide dot files".
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11645
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Dec 16 07:21:10 CET 2015 on sn-devel-104

commit 0fd68d0cf5a8e6b968b4b0fad5cff97ebad2c7aa
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 15 22:12:11 2015 +0100

    librpc: Fix typos
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

commit 6aaa8b695e0005dfa93fc96eb02cc2c681f222cd
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 15 14:43:46 2015 +0100

    lib: Remove ntstatus.h from gencache.h
    
    No clue why I put it there, sorry for the noise...
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 librpc/ndr/ndr_dns.c   | 2 +-
 librpc/ndr/ndr_nbt.c   | 2 +-
 source3/lib/gencache.h | 1 -
 source3/smbd/dosmode.c | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_dns.c b/librpc/ndr/ndr_dns.c
index 0b9e3b0..cc35217 100644
--- a/librpc/ndr/ndr_dns.c
+++ b/librpc/ndr/ndr_dns.c
@@ -168,7 +168,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_dns_string(struct ndr_push *ndr,
 		size_t complen;
 		uint32_t offset;
 
-		/* see if we have pushed the remaing string allready,
+		/* see if we have pushed the remaining string already,
 		 * if so we use a label pointer to this string
 		 */
 		ndr_err = ndr_token_retrieve_cmp_fn(&ndr->dns_string_list, s,
diff --git a/librpc/ndr/ndr_nbt.c b/librpc/ndr/ndr_nbt.c
index ada1335..838f947 100644
--- a/librpc/ndr/ndr_nbt.c
+++ b/librpc/ndr/ndr_nbt.c
@@ -151,7 +151,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_nbt_string(struct ndr_push *ndr, int ndr_fla
 		size_t complen;
 		uint32_t offset;
 
-		/* see if we have pushed the remaing string allready,
+		/* see if we have pushed the remaining string already,
 		 * if so we use a label pointer to this string
 		 */
 		ndr_err = ndr_token_retrieve_cmp_fn(&ndr->nbt_string_list, s, &offset, (comparison_fn_t)strcmp, false);
diff --git a/source3/lib/gencache.h b/source3/lib/gencache.h
index 61716c4..4371835 100644
--- a/source3/lib/gencache.h
+++ b/source3/lib/gencache.h
@@ -27,7 +27,6 @@
 #include "replace.h"
 #include "system/time.h"
 #include "lib/util/data_blob.h"
-#include "libcli/util/ntstatus.h"
 
 bool gencache_set(const char *keystr, const char *value, time_t timeout);
 bool gencache_del(const char *keystr);
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 0f3eef0..0996007 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -365,7 +365,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
 		dosattr |= FILE_ATTRIBUTE_DIRECTORY;
 	}
 	/* FILE_ATTRIBUTE_SPARSE is valid on get but not on set. */
-	*pattr = (uint32_t)(dosattr & (SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE));
+	*pattr |= (uint32_t)(dosattr & (SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE));
 
 	dos_mode_debug_print(__func__, *pattr);
 


-- 
Samba Shared Repository