diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-08-13 02:03:16 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-08-13 02:03:16 +0000 |
| commit | 9665caf83276aa8a3115db69342e898fb7b39172 (patch) | |
| tree | 00501a16929956e0176cdf84494cae89e8d48021 | |
| parent | a027153046b2eb80e5c884c4ceadc4507844ac85 (diff) | |
| download | samba-9665caf83276aa8a3115db69342e898fb7b39172.tar.gz samba-9665caf83276aa8a3115db69342e898fb7b39172.tar.xz samba-9665caf83276aa8a3115db69342e898fb7b39172.zip | |
make sure we give the chosen workgroup in gentest
(This used to be commit b8aa4a9a8f53d5307105424d90895dffefdc5e64)
| -rw-r--r-- | source4/torture/gentest.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index abe6d057c31..3519b51f147 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -175,7 +175,7 @@ static BOOL connect_servers(void) "gentest", servers[i].server_name, NULL, servers[i].share_name, "?????", - servers[i].username, "", + servers[i].username, lp_workgroup(), servers[i].password, 0, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect to \\\\%s\\%s - %s\n", @@ -989,7 +989,11 @@ again: } while(0) #define CHECK_WSTR_EQUAL(field) do { \ - if (strcmp(parm[0].field.s, parm[1].field.s) != 0 && !ignore_pattern(#field)) { \ + if ((!parm[0].field.s && parm[1].field.s) || (parm[0].field.s && !parm[1].field.s)) { \ + printf("%s is NULL!\n", #field); \ + return False; \ + } \ + if (parm[0].field.s && strcmp(parm[0].field.s, parm[1].field.s) != 0 && !ignore_pattern(#field)) { \ printf("Mismatch in %s - %s %s\n", #field, \ parm[0].field.s, parm[1].field.s); \ return False; \ |