r25398: Parse loadparm context to all lp_*() functions.

[kai/samba.git] / source4 / torture / raw / composite.c

diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 374ff3cb984b0086347ec657bbbd5b29c280a253..ab406f86245fb43ff22602143db38b791f4f5f00 100644 (file)
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -30,6 +30,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define BASEDIR "\\composite"
 
@@ -67,7 +68,7 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        status = smb_composite_savefile(cli->tree, &io1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("savefile failed: %s\n", nt_errstr(status));
+               printf("(%s) savefile failed: %s\n", __location__,nt_errstr(status));
                return False;
        }
 
@@ -86,8 +87,8 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        printf("waiting for completion\n");
        while (*count != num_ops) {
                event_loop_once(cli->transport->socket->event.ctx);
-               if (lp_parm_bool(-1, "torture", "progress", true)) {
-                       printf("count=%d\r", *count);
+               if (lp_parm_bool(NULL, "torture", "progress", true)) {
+                       printf("(%s) count=%d\r", __location__, *count);
                        fflush(stdout);
                }
        }
@@ -96,18 +97,18 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        for (i=0;i<num_ops;i++) {
                status = smb_composite_loadfile_recv(c[i], mem_ctx);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("loadfile[%d] failed - %s\n", i, nt_errstr(status));
+                       printf("(%s) loadfile[%d] failed - %s\n", __location__, i, nt_errstr(status));
                        return False;
                }
 
                if (io2.out.size != len) {
-                       printf("wrong length in returned data - %d should be %d\n",
+                       printf("(%s) wrong length in returned data - %d should be %d\n",__location__,
                               io2.out.size, (int)len);
                        return False;
                }
                
                if (memcmp(io2.out.data, data, len) != 0) {
-                       printf("wrong data in loadfile!\n");
+                       printf("(%s) wrong data in loadfile!\n",__location__);
                        return False;
                }
        }
@@ -147,18 +148,18 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        status = smb_composite_savefile(cli->tree, &io1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("savefile failed: %s\n", nt_errstr(status));
+               printf("(%s) savefile failed: %s\n",__location__, nt_errstr(status));
                return False;
        }
 
-       io2.in.dest_host = lp_parm_string(-1, "torture", "host");
+       io2.in.dest_host = lp_parm_string(NULL, "torture", "host");
        io2.in.port = 0;
-       io2.in.called_name = lp_parm_string(-1, "torture", "host");
-       io2.in.service = lp_parm_string(-1, "torture", "share");
+       io2.in.called_name = lp_parm_string(NULL, "torture", "host");
+       io2.in.service = lp_parm_string(NULL, "torture", "share");
        io2.in.service_type = "A:";
 
        io2.in.credentials = cmdline_credentials;
-       io2.in.workgroup  = lp_workgroup();
+       io2.in.workgroup  = lp_workgroup(global_loadparm);
        io2.in.filename = fname;
 
        printf("testing parallel fetchfile with %d ops\n", torture_numops);
@@ -176,8 +177,8 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        while (*count != torture_numops) {
                event_loop_once(event_ctx);
-               if (lp_parm_bool(-1, "torture", "progress", true)) {
-                       printf("count=%d\r", *count);
+               if (lp_parm_bool(NULL, "torture", "progress", true)) {
+                       printf("(%s) count=%d\r", __location__, *count);
                        fflush(stdout);
                }
        }
@@ -186,22 +187,22 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        for (i=0;i<torture_numops;i++) {
                status = smb_composite_fetchfile_recv(c[i], mem_ctx);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("loadfile[%d] failed - %s\n", i,
+                       printf("(%s) loadfile[%d] failed - %s\n", __location__, i,
                               nt_errstr(status));
                        ret = False;
                        continue;
                }
 
                if (io2.out.size != len) {
-                       printf("wrong length in returned data - %d "
-                              "should be %d\n",
+                       printf("(%s) wrong length in returned data - %d "
+                              "should be %d\n", __location__,
                               io2.out.size, (int)len);
                        ret = False;
                        continue;
                }
                
                if (memcmp(io2.out.data, data, len) != 0) {
-                       printf("wrong data in loadfile!\n");
+                       printf("(%s) wrong data in loadfile!\n", __location__);
                        ret = False;
                        continue;
                }
@@ -242,7 +243,7 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
          
                status = smb_composite_savefile(cli->tree, &io1);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("savefile failed: %s\n", nt_errstr(status));
+                       printf("(%s) savefile failed: %s\n", __location__, nt_errstr(status));
                        return False;
                }
 
@@ -251,7 +252,7 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                io_orig[i]->in.sd = security_descriptor_initialise(io_orig[i]);
                status = smb_composite_appendacl(cli->tree, io_orig[i], io_orig[i]);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("appendacl failed: %s\n", nt_errstr(status));
+                       printf("(%s) appendacl failed: %s\n", __location__, nt_errstr(status));
                        return False;
                }
        }
@@ -271,7 +272,7 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        status = security_descriptor_dacl_add(test_sd, ace);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("appendacl failed: %s\n", nt_errstr(status));
+               printf("(%s) appendacl failed: %s\n", __location__, nt_errstr(status));
                return False;
        }
 
@@ -296,8 +297,8 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        printf("waiting for completion\n");
        while (*count != num_ops) {
                event_loop_once(event_ctx);
-               if (lp_parm_bool(-1, "torture", "progress", true)) {
-                       printf("count=%d\r", *count);
+               if (lp_parm_bool(NULL, "torture", "progress", true)) {
+                       printf("(%s) count=%d\r", __location__, *count);
                        fflush(stdout);
                }
        }
@@ -306,13 +307,13 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        for (i=0; i < num_ops; i++) {
                status = smb_composite_appendacl_recv(c[i], io[i]);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("appendacl[%d] failed - %s\n", i, nt_errstr(status));
+                       printf("(%s) appendacl[%d] failed - %s\n", __location__, i, nt_errstr(status));
                        return False;
                }
                
                security_descriptor_dacl_add(io_orig[i]->out.sd, ace);
                if (!security_acl_equal(io_orig[i]->out.sd->dacl, io[i]->out.sd->dacl)) {
-                       printf("appendacl[%d] failed - needed acl isn't set\n", i);
+                       printf("(%s) appendacl[%d] failed - needed acl isn't set\n", __location__, i);
                        return False;
                }
        }
@@ -339,13 +340,13 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        int *count = talloc_zero(mem_ctx, int);
        BOOL ret = True;
 
-       io1.in.dest_host = lp_parm_string(-1, "torture", "host");
+       io1.in.dest_host = lp_parm_string(NULL, "torture", "host");
        io1.in.port = 0;
-       io1.in.called_name = lp_parm_string(-1, "torture", "host");
-       io1.in.service = lp_parm_string(-1, "torture", "share");
+       io1.in.called_name = lp_parm_string(NULL, "torture", "host");
+       io1.in.service = lp_parm_string(NULL, "torture", "share");
        io1.in.service_type = "A:";
        io1.in.credentials = cmdline_credentials;
-       io1.in.workgroup = lp_workgroup();
+       io1.in.workgroup = lp_workgroup(global_loadparm);
        io1.in.level = RAW_QFS_OBJECTID_INFORMATION;
 
        printf("testing parallel queryfsinfo [Object ID] with %d ops\n", torture_numops);
@@ -363,8 +364,8 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        while (*count < torture_numops) {
                event_loop_once(event_ctx);
-               if (lp_parm_bool(-1, "torture", "progress", true)) {
-                       printf("count=%d\r", *count);
+               if (lp_parm_bool(NULL, "torture", "progress", true)) {
+                       printf("(%s) count=%d\r", __location__, *count);
                        fflush(stdout);
                }
        }
@@ -373,14 +374,14 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        for (i=0;i<torture_numops;i++) {
                status = smb_composite_fsinfo_recv(c[i], mem_ctx);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("fsinfo[%d] failed - %s\n", i, nt_errstr(status));
+                       printf("(%s) fsinfo[%d] failed - %s\n", __location__, i, nt_errstr(status));
                        ret = False;
                        continue;
                }
 
                if (io1.out.fsinfo->generic.level != RAW_QFS_OBJECTID_INFORMATION) {
-                       printf("wrong level in returned info - %d "
-                              "should be %d\n",
+                       printf("(%s) wrong level in returned info - %d "
+                              "should be %d\n", __location__,
                               io1.out.fsinfo->generic.level, RAW_QFS_OBJECTID_INFORMATION);
                        ret = False;
                        continue;
@@ -400,7 +401,7 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
    basic testing of libcli composite calls
 */
 bool torture_raw_composite(struct torture_context *tctx, 
-                                                  struct smbcli_state *cli)
+                          struct smbcli_state *cli)
 {
        bool ret = true;