diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-05-24 14:45:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:34 -0500 |
| commit | 3d448a1851bf2502e020cb101138ba229ae4b83a (patch) | |
| tree | 5a04e7992c156f73849b1f972b564b0a84b36e72 /source4/torture/basic/base.c | |
| parent | 20389549f14fe6448a1116a04073489d2860c192 (diff) | |
| download | samba-3d448a1851bf2502e020cb101138ba229ae4b83a.tar.gz samba-3d448a1851bf2502e020cb101138ba229ae4b83a.tar.bz2 samba-3d448a1851bf2502e020cb101138ba229ae4b83a.zip | |
r15865: using dirname for a variable isn't that good,
but making it a global symbol is really bad...
fix linking on sun1 in the build-farm
metze
(This used to be commit d073320f642ceeb49b11060aa958608248f3aff5)
Diffstat (limited to 'source4/torture/basic/base.c')
| -rw-r--r-- | source4/torture/basic/base.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index ddcbcba2e6..70dab96dfa 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -1619,7 +1619,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *torture) BOOL result = False; int fnum; const char *os2_fname = ".+,;=[]."; - const char *dirname = "samba3_errordir"; + const char *dname = "samba3_errordir"; union smb_open io; TALLOC_CTX *mem_ctx = talloc_init(NULL); NTSTATUS status; @@ -1656,10 +1656,10 @@ static BOOL torture_samba3_errorpaths(struct torture_context *torture) } smbcli_unlink(cli_nt->tree, os2_fname); - smbcli_rmdir(cli_nt->tree, dirname); + smbcli_rmdir(cli_nt->tree, dname); - if (!NT_STATUS_IS_OK(smbcli_mkdir(cli_nt->tree, dirname))) { - printf("smbcli_mkdir(%s) failed: %s\n", dirname, + if (!NT_STATUS_IS_OK(smbcli_mkdir(cli_nt->tree, dname))) { + printf("smbcli_mkdir(%s) failed: %s\n", dname, smbcli_errstr(cli_nt->tree)); goto fail; } @@ -1675,7 +1675,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *torture) io.ntcreatex.in.create_options = 0; io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; io.ntcreatex.in.security_flags = 0; - io.ntcreatex.in.fname = dirname; + io.ntcreatex.in.fname = dname; status = smb_raw_open(cli_nt->tree, mem_ctx, &io); if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) { @@ -1692,14 +1692,14 @@ static BOOL torture_samba3_errorpaths(struct torture_context *torture) goto fail; } - status = smbcli_mkdir(cli_nt->tree, dirname); + status = smbcli_mkdir(cli_nt->tree, dname); if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) { printf("(%s) incorrect status %s should be %s\n", __location__, nt_errstr(status), nt_errstr(NT_STATUS_OBJECT_NAME_COLLISION)); goto fail; } - status = smbcli_mkdir(cli_dos->tree, dirname); + status = smbcli_mkdir(cli_dos->tree, dname); if (!NT_STATUS_EQUAL(status, NT_STATUS_DOS(ERRDOS, ERRnoaccess))) { printf("(%s) incorrect status %s should be %s\n", __location__, nt_errstr(status), |