[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  e673afa s3-vfstest: Return an error code if cmd failed
      from  1082532 Honor SeTakeOwnershiPrivilege when client asks for SEC_STD_WRITE_OWNER but has no permission for that, but token has SeTakeOwnershipPrivilege

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


- Log -----------------------------------------------------------------
commit e673afada1248535b992ceb28b8fcef106a85e05
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Feb 22 17:57:08 2012 +0100

    s3-vfstest: Return an error code if cmd failed
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Wed Feb 22 23:56:18 CET 2012 on sn-devel-104

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

Summary of changes:
 source3/torture/vfstest.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 53b5ee9..40e78e8 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -452,6 +452,7 @@ int main(int argc, char *argv[])
 	char cwd[MAXPATHLEN];
 	TALLOC_CTX *frame = talloc_stackframe();
 	struct tevent_context *ev = tevent_context_init(NULL);
+	NTSTATUS status = NT_STATUS_OK;
 
 	/* make sure the vars that get altered (4th field) are in
 	   a fixed location or certain compilers complain */
@@ -532,11 +533,11 @@ int main(int argc, char *argv[])
 		char    *p = cmdstr;
 
 		while((cmd=next_command(frame, &p)) != NULL) {
-			process_cmd(&vfs, cmd);
+			status = process_cmd(&vfs, cmd);
 		}
 
 		TALLOC_FREE(cmd);
-		return 0;
+		return NT_STATUS_IS_OK(status) ? 0 : 1;
 	}
 
 	/* Loop around accepting commands */
@@ -551,12 +552,12 @@ int main(int argc, char *argv[])
 		}
 
 		if (line[0] != '\n') {
-			process_cmd(&vfs, line);
+			status = process_cmd(&vfs, line);
 		}
 		SAFE_FREE(line);
 	}
 
 	TALLOC_FREE(vfs.conn);
 	TALLOC_FREE(frame);
-	return 0;
+	return NT_STATUS_IS_OK(status) ? 0 : 1;
 }


-- 
Samba Shared Repository