diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-14 05:11:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:50 -0500 |
| commit | 205071ddc6c2140ee93ae3b4d93e06cddd585164 (patch) | |
| tree | 5b158d19f9298d77e79365925df0463ae28eca81 /source4 | |
| parent | a065adeacb8a8c8f7ad5041b64e3059afa0d1e26 (diff) | |
| download | samba-205071ddc6c2140ee93ae3b4d93e06cddd585164.tar.gz samba-205071ddc6c2140ee93ae3b4d93e06cddd585164.tar.bz2 samba-205071ddc6c2140ee93ae3b4d93e06cddd585164.zip | |
r5390: use __location__ to make tracking down errors in RPC-SAMSYNC easier
(This used to be commit 40a8340f1b0fdb3b86f6330be4e1cec3959e89ee)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/samsync.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index f1cbad2f05..35d36e9bf8 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -209,7 +209,8 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx, #define TEST_UINT64_EQUAL(i1, i2) do {\ if (i1 != i2) {\ - printf("uint64 mismatch: " #i1 ": 0x%08x%08x (%lld) != " #i2 ": 0x%08x%08x (%lld)\n", \ + printf("%s: uint64 mismatch: " #i1 ": 0x%08x%08x (%lld) != " #i2 ": 0x%08x%08x (%lld)\n", \ + __location__, \ (uint32_t)(i1 >> 32), (uint32_t)(i1 & 0xFFFFFFFF), i1, \ (uint32_t)(i2 >> 32), (uint32_t)(i2 & 0xFFFFFFFF), i2);\ ret = False;\ @@ -217,15 +218,15 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx, } while (0) #define TEST_INT_EQUAL(i1, i2) do {\ if (i1 != i2) {\ - printf("integer mismatch: " #i1 ":%d != " #i2 ": %d\n", \ - i1, i2);\ + printf("%s: integer mismatch: " #i1 ":%d != " #i2 ": %d\n", \ + __location__, i1, i2);\ ret = False;\ } \ } while (0) #define TEST_TIME_EQUAL(t1, t2) do {\ if (t1 != t2) {\ - printf("NTTIME mismatch: " #t1 ":%s != " #t2 ": %s\n", \ - nt_time_string(mem_ctx, t1), nt_time_string(mem_ctx, t2));\ + printf("%s: NTTIME mismatch: " #t1 ":%s != " #t2 ": %s\n", \ + __location__, nt_time_string(mem_ctx, t1), nt_time_string(mem_ctx, t2));\ ret = False;\ } \ } while (0) @@ -233,16 +234,16 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx, #define TEST_STRING_EQUAL(s1, s2) do {\ if (!((!s1.string || s1.string[0]=='\0') && (!s2.string || s2.string[0]=='\0')) \ && strcmp_safe(s1.string, s2.string) != 0) {\ - printf("string mismatch: " #s1 ":%s != " #s2 ": %s\n", \ - s1.string, s2.string);\ + printf("%s: string mismatch: " #s1 ":%s != " #s2 ": %s\n", \ + __location__, s1.string, s2.string);\ ret = False;\ } \ } while (0) #define TEST_SID_EQUAL(s1, s2) do {\ if (!dom_sid_equal(s1, s2)) {\ - printf("dom_sid mismatch: " #s1 ":%s != " #s2 ": %s\n", \ - dom_sid_string(mem_ctx, s1), dom_sid_string(mem_ctx, s2));\ + printf("%s: dom_sid mismatch: " #s1 ":%s != " #s2 ": %s\n", \ + __location__, dom_sid_string(mem_ctx, s1), dom_sid_string(mem_ctx, s2));\ ret = False;\ } \ } while (0) |