[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  b6aabcd... Add torture test for bug 7310 - DOS attribute inconsistency with MS Office
      from  e18ddb6... s3:winbindd: remove unused variables

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


- Log -----------------------------------------------------------------
commit b6aabcd628f3af1302a03af8cde15baa8d1f2905
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 1 15:01:43 2010 -0700

    Add torture test for bug 7310 - DOS attribute inconsistency with MS Office
    
    Ensure we don't regress.
    
    Jeremy.

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

Summary of changes:
 source3/torture/torture.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index d452097..b454a7d 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3790,6 +3790,7 @@ static bool run_rename(int dummy)
 	const char *fname1 = "\\test1.txt";
 	bool correct = True;
 	uint16_t fnum1;
+	uint16_t attr;
 	NTSTATUS status;
 
 	printf("starting rename test\n");
@@ -3944,13 +3945,30 @@ static bool run_rename(int dummy)
           } */
 
         /*--*/
-
-
 	if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
 		printf("close - 5 failed (%s)\n", cli_errstr(cli1));
 		return False;
 	}
 
+	/* Check that the renamed file has FILE_ATTRIBUTE_ARCHIVE. */
+	if (!NT_STATUS_IS_OK(cli_getatr(cli1, fname1, &attr, NULL, NULL))) {
+		printf("getatr on file %s failed - %s ! \n",
+			fname1,
+			cli_errstr(cli1));
+		correct = False;
+	} else {
+		if (attr != FILE_ATTRIBUTE_ARCHIVE) {
+			printf("Renamed file %s has wrong attr 0x%x "
+				"(should be 0x%x)\n",
+				fname1,
+				attr,
+				(unsigned int)FILE_ATTRIBUTE_ARCHIVE);
+			correct = False;
+		} else {
+			printf("Renamed file %s has archive bit set\n", fname1);
+		}
+	}
+
 	cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
 	cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
 


-- 
Samba Shared Repository