s4:torture/locktest: comment out unused code and avoid smbcli_nt_error()
authorStefan Metzmacher <metze@samba.org>
Thu, 27 Feb 2014 08:08:17 +0000 (09:08 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 25 Nov 2014 06:25:46 +0000 (07:25 +0100)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source4/torture/locktest.c

index 0d2608f7c3b61ed4908f109271d56d0e49844209..ac8d854a358d672a98a5268e945a0281f6520232 100644 (file)
@@ -221,7 +221,7 @@ static bool test_one(struct smbcli_state *cli[NSERVERS][NCONNECTIONS],
        uint64_t len = rec->len;
        enum brl_type op = rec->lock_type;
        int server;
-       bool ret[NSERVERS];
+       /* bool ret[NSERVERS]; */
        NTSTATUS status[NSERVERS];
 
        switch (rec->lock_op) {
@@ -256,8 +256,8 @@ static bool test_one(struct smbcli_state *cli[NSERVERS][NCONNECTIONS],
                                res = smb_raw_lock(tree, &parms);
                        }
 
-                       ret[server] = NT_STATUS_IS_OK(res); 
-                       status[server] = smbcli_nt_error(cli[server][conn]->tree);
+                       /* ret[server] = NT_STATUS_IS_OK(res); */
+                       status[server] = res;
                        if (!exact_error_codes && 
                            NT_STATUS_EQUAL(status[server], 
                                            NT_STATUS_FILE_LOCK_CONFLICT)) {
@@ -302,8 +302,8 @@ static bool test_one(struct smbcli_state *cli[NSERVERS][NCONNECTIONS],
                                res = smb_raw_lock(tree, &parms);
                        }
 
-                       ret[server] = NT_STATUS_IS_OK(res);
-                       status[server] = smbcli_nt_error(cli[server][conn]->tree);
+                       /* ret[server] = NT_STATUS_IS_OK(res); */
+                       status[server] = res;
                }
                if (showall || 
                    (!hide_unlock_fails && !NT_STATUS_EQUAL(status[0],status[1]))) {