s3: Remove two calls to cli_errstr
authorVolker Lendecke <vl@samba.org>
Sun, 27 Mar 2011 09:50:55 +0000 (11:50 +0200)
committerVolker Lendecke <vlendec@samba.org>
Sun, 27 Mar 2011 11:17:47 +0000 (13:17 +0200)
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Mar 27 13:17:47 CEST 2011 on sn-devel-104

source3/client/client.c

index a6a7a22e3f3e338a6ee7d264325e4322857fb365..000970e5ccd2e627b723248fa41ea5e55011d3e2 100644 (file)
@@ -1814,12 +1814,15 @@ static int do_put(const char *rname, const char *lname, bool reput)
        if (reput) {
                status = cli_open(targetcli, targetname, O_RDWR|O_CREAT, DENY_NONE, &fnum);
                if (NT_STATUS_IS_OK(status)) {
-                       if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                       if (!NT_STATUS_IS_OK(status = cli_qfileinfo_basic(
                                                     targetcli, fnum, NULL,
                                                     &start, NULL, NULL,
                                                     NULL, NULL, NULL)) &&
-                           !NT_STATUS_IS_OK(cli_getattrE(targetcli, fnum, NULL, &start, NULL, NULL, NULL))) {
-                               d_printf("getattrib: %s\n",cli_errstr(cli));
+                           !NT_STATUS_IS_OK(status = cli_getattrE(
+                                                    targetcli, fnum, NULL,
+                                                    &start, NULL, NULL,
+                                                    NULL))) {
+                               d_printf("getattrib: %s\n", nt_errstr(status));
                                return 1;
                        }
                }
@@ -1828,7 +1831,8 @@ static int do_put(const char *rname, const char *lname, bool reput)
        }
 
        if (!NT_STATUS_IS_OK(status)) {
-               d_printf("%s opening remote file %s\n",cli_errstr(targetcli),rname);
+               d_printf("%s opening remote file %s\n", nt_errstr(status),
+                        rname);
                return 1;
        }