The branch, master has been updated via eba5d0b s3: Remove a use of cli_errstr from 1caa7a8 s3-waf: Fix linking bugs causing segfaults.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit eba5d0b64162c7250ad4869c3393d0d00aff868c Author: Volker Lendecke <v...@samba.org> Date: Thu Jul 7 15:42:33 2011 +0200 s3: Remove a use of cli_errstr Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Thu Jul 7 18:04:26 CEST 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/torture/torture.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 7e2a5e7..64f8bf7 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -642,8 +642,12 @@ static bool rw_torture3(struct cli_state *c, char *lockfname) if (procnum == 0) { - if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) { - printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c)); + status = cli_unlink( + c, lockfname, + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN); + if (!NT_STATUS_IS_OK(status)) { + printf("unlink failed (%s) (normal, this file should " + "not exist)\n", nt_errstr(status)); } status = cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, -- Samba Shared Repository