s4-torture: minor debugging enhancements
authorAndrew Tridgell <tridge@samba.org>
Fri, 16 Oct 2009 23:54:46 +0000 (10:54 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sat, 17 Oct 2009 02:01:04 +0000 (13:01 +1100)
source4/torture/raw/acls.c

index b56345656a1ae4a4f9c47199d607095c5706c14e..8f58c4765bbbb34ff59ae8a55ed8649d87a94dc5 100644 (file)
@@ -1410,7 +1410,7 @@ static bool test_inheritance(struct torture_context *tctx,
 
                if (!(test_flags[i].parent_flags & SEC_ACE_FLAG_OBJECT_INHERIT)) {
                        if (!security_descriptor_equal(q.query_secdesc.out.sd, sd_def)) {
-                               printf("Expected default sd:\n");
+                               printf(__location__ ": Expected default sd for i=%d:\n", i);
                                NDR_PRINT_DEBUG(security_descriptor, sd_def);
                                printf("at %d - got:\n", i);
                                NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd);
@@ -1639,8 +1639,8 @@ static bool test_inheritance_dynamic(struct torture_context *tctx,
 {
        NTSTATUS status;
        union smb_open io;
-       const char *dname = BASEDIR "\\inheritance";
-       const char *fname1 = BASEDIR "\\inheritance\\testfile";
+       const char *dname = BASEDIR "\\inheritance2";
+       const char *fname1 = BASEDIR "\\inheritance2\\testfile";
        bool ret = true;
        int fnum=0, fnum2;
        union smb_fileinfo q;