diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-12-09 19:36:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:14 -0500 |
| commit | cdfdb732805da3dad447583e0a1f9abea11ba1a2 (patch) | |
| tree | 4e525e011f9f392f44cd34cfc65bc86aced6d36b | |
| parent | f2c3c28a7c71c323c3daf8e245d79c76df2f660d (diff) | |
| download | samba-cdfdb732805da3dad447583e0a1f9abea11ba1a2.tar.gz samba-cdfdb732805da3dad447583e0a1f9abea11ba1a2.tar.bz2 samba-cdfdb732805da3dad447583e0a1f9abea11ba1a2.zip | |
r12150: Reformatting
(This used to be commit aaa21b7132ec81008ad2ec7b2aafc4604d13093d)
| -rw-r--r-- | source4/torture/basic/delete.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index 081058af42..60db6a78ed 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -697,27 +697,30 @@ BOOL torture_test_delete(void) smbcli_setatr(cli1->tree, fname, 0, 0); smbcli_unlink(cli1->tree, fname); - printf("eleventh delete on close test succeeded.\n"); - /* test 12 - does having read only attribute still allow delete on close at time of open. */ + /* test 12 - does having read only attribute still allow delete on + * close at time of open. */ fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_RIGHTS_FILE_ALL, FILE_ATTRIBUTE_READONLY, - NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, + NTCREATEX_SHARE_ACCESS_DELETE, + NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0); if (fnum1 != -1) { - printf("(%s) open of %s succeeded. Should fail with NT_STATUS_CANNOT_DELETE.\n", - __location__, fname); + printf("(%s) open of %s succeeded. Should fail with " + "NT_STATUS_CANNOT_DELETE.\n", __location__, fname); smbcli_close(cli1->tree, fnum1); correct = False; goto fail; } else { status = smbcli_nt_error(cli1->tree); if (!NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) { - printf("(%s) setting delete_on_close on open should fail with NT_STATUS_CANNOT_DELETE. Got %s instead)\n", + printf("(%s) setting delete_on_close on open should " + "fail with NT_STATUS_CANNOT_DELETE. Got %s " + "instead)\n", __location__, smbcli_errstr(cli1->tree)); correct = False; goto fail; @@ -737,7 +740,9 @@ BOOL torture_test_delete(void) SEC_FILE_WRITE_DATA| SEC_STD_DELETE, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, + NTCREATEX_SHARE_ACCESS_READ| + NTCREATEX_SHARE_ACCESS_WRITE| + NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); @@ -753,7 +758,9 @@ BOOL torture_test_delete(void) SEC_FILE_WRITE_DATA| SEC_STD_DELETE, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, + NTCREATEX_SHARE_ACCESS_READ| + NTCREATEX_SHARE_ACCESS_WRITE| + NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 0, 0); if (fnum2 == -1) { |