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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  eb03383 From metze's work on sparse attributes. FILE_ATTRIBUTE_SPARSE is valid on get but not on set. (cherry picked from commit e9f9e803f03be20e5f573484be7b5e7351472786)
       via  22d9791 s3-printing: fix printer_list_traverse()
      from  f1c3c4b s3: Fix bug 7066 -- wbcAuthenticateEx gives unix times

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


- Log -----------------------------------------------------------------
commit eb03383e8a51f489f30412f7be23aace4a36c24c
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 20 10:23:27 2010 -0800

    From metze's work on sparse attributes. FILE_ATTRIBUTE_SPARSE is valid on get but not on set.
    (cherry picked from commit e9f9e803f03be20e5f573484be7b5e7351472786)

commit 22d979142941ac4135b20c937156a83d8439fb06
Author: David Disseldorp <ddiss at suse.de>
Date:   Mon Dec 20 16:08:02 2010 +0100

    s3-printing: fix printer_list_traverse()
    
    The tdb traverse function returns the number of elements traversed, or
    less than zero on error, printer_list_traverse() is incorrectly checking
    for non-zero return.
    
    Autobuild-User: Andreas Schneider <asn at samba.org>
    Autobuild-Date: Mon Dec 20 18:44:41 CET 2010 on sn-devel-104
    (cherry picked from commit 139e2cbb13ca230b65ad4b1f5ff91a795d8cca02)

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

Summary of changes:
 source3/include/smb.h           |    3 +--
 source3/printing/printer_list.c |    2 +-
 source3/smbd/dosmode.c          |    3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index b87caf2..2b397cc 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1211,8 +1211,7 @@ struct bitmap {
 					FILE_ATTRIBUTE_HIDDEN|\
 					FILE_ATTRIBUTE_SYSTEM|\
 					FILE_ATTRIBUTE_DIRECTORY|\
-					FILE_ATTRIBUTE_ARCHIVE|\
-					FILE_ATTRIBUTE_SPARSE)
+					FILE_ATTRIBUTE_ARCHIVE)
 
 /* Flags - combined with attributes. */
 #define FILE_FLAG_WRITE_THROUGH    0x80000000L
diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index edc398b..f3f00f0 100644
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -293,7 +293,7 @@ static NTSTATUS printer_list_traverse(printer_list_trv_fn_t *fn,
 	}
 
 	ret = db->traverse(db, fn, private_data);
-	if (ret != 0) {
+	if (ret < 0) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 628f887..2c6dcd0 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -318,7 +318,8 @@ static bool get_ea_dos_attribute(connection_struct *conn,
 	if (S_ISDIR(smb_fname->st.st_ex_mode)) {
 		dosattr |= aDIR;
 	}
-	*pattr = (uint32)(dosattr & SAMBA_ATTRIBUTES_MASK);
+	/* FILE_ATTRIBUTE_SPARSE is valid on get but not on set. */
+	*pattr = (uint32)(dosattr & (SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE));
 
 	DEBUG(8,("get_ea_dos_attribute returning (0x%x)", dosattr));
 


-- 
Samba Shared Repository