sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s3-torture/nbio.c: Fix cli_errstr() usage (part of bug #7864)

Browse Source 
Convert cli_errstr() to nt_errstr()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Björn Baumbach 2011-02-07 11:27:02 +01:00 committed by Stefan Metzmacher
parent 26f7c0771b
commit 23e23d0836
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/torture/nbio.c
View File

@ -135,10 +135,13 @@ void nb_setup(struct cli_state *cli)
void nb_unlink(const char *fname)
{
if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
NTSTATUS status;
status = cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(status)) {
#if NBDEBUG
printf("(%d) unlink %s failed (%s)\n",
line_count, fname, cli_errstr(c));
line_count, fname, nt_errstr(status));
#endif
}
}
@ -166,7 +169,7 @@ void nb_createx(const char *fname,
create_options, 0, &fd);
if (!NT_STATUS_IS_OK(status) && handle != -1) {
printf("ERROR: cli_ntcreate failed for %s - %s\n",
fname, cli_errstr(c));
fname, nt_errstr(status));
exit(1);
}
if (NT_STATUS_IS_OK(status) && handle == -1) {
@ -233,18 +236,24 @@ void nb_close(int handle)
void nb_rmdir(const char *fname)
{
if (!NT_STATUS_IS_OK(cli_rmdir(c, fname))) {
NTSTATUS status;
status = cli_rmdir(c, fname);
if (!NT_STATUS_IS_OK(status)) {
printf("ERROR: rmdir %s failed (%s)\n",
fname, cli_errstr(c));
fname, nt_errstr(status));
exit(1);
}
}
void nb_rename(const char *oldname, const char *newname)
{
if (!NT_STATUS_IS_OK(cli_rename(c, oldname, newname))) {
NTSTATUS status;
status = cli_rename(c, oldname, newname);
if (!NT_STATUS_IS_OK(status)) {
printf("ERROR: rename %s %s failed (%s)\n",
oldname, newname, cli_errstr(c));
oldname, newname, nt_errstr(status));
exit(1);
}
}