r26540: Revert my previous commit after concerns raised by Andrew.

[jra/samba/.git] / source4 / client / cifsdd.c

diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index cb42e992ce0698dba0545dd5bf9c4017b77659b4..08c152c3a5cf01ae591a05ee289de31184be2348 100644 (file)
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -219,7 +219,7 @@ fail:
        return;
 }
 
-BOOL check_arg_bool(const char * name)
+bool check_arg_bool(const char * name)
 {
        struct argdef * arg;
 
@@ -230,7 +230,7 @@ BOOL check_arg_bool(const char * name)
 
        DEBUG(0, ("invalid argument name: %s", name));
        SMB_ASSERT(0);
-       return(False);
+       return(false);
 }
 
 uint64_t check_arg_numeric(const char * name)
@@ -351,7 +351,7 @@ static void print_transfer_stats(void)
        }
 }
 
-static struct dd_iohandle * open_file(const char * which)
+static struct dd_iohandle * open_file(const char * which, const char **ports)
 {
        int                     options = 0;
        const char *            path = NULL;
@@ -371,12 +371,12 @@ static struct dd_iohandle * open_file(const char * which)
 
        if (strcmp(which, "if") == 0) {
                path = check_arg_pathname("if");
-               handle = dd_open_path(path, check_arg_numeric("ibs"),
+               handle = dd_open_path(path, ports, check_arg_numeric("ibs"),
                                        options);
        } else if (strcmp(which, "of") == 0) {
                options |= DD_WRITE;
                path = check_arg_pathname("of");
-               handle = dd_open_path(path, check_arg_numeric("obs"),
+               handle = dd_open_path(path, ports, check_arg_numeric("obs"),
                                        options);
        } else {
                SMB_ASSERT(0);
@@ -390,15 +390,15 @@ static struct dd_iohandle * open_file(const char * which)
        return(handle);
 }
 
-static void set_max_xmit(uint64_t iomax)
+static void set_max_xmit(struct loadparm_context *lp_ctx, uint64_t iomax)
 {
        char buf[64];
 
        snprintf(buf, sizeof(buf), "%llu", (unsigned long long)iomax);
-       lp_set_cmdline(global_loadparm, "max xmit", buf);
+       lp_set_cmdline(lp_ctx, "max xmit", buf);
 }
 
-static int copy_files(void)
+static int copy_files(struct loadparm_context *lp_ctx)
 {
        uint8_t *       iobuf;  /* IO buffer. */
        uint64_t        iomax;  /* Size of the IO buffer. */
@@ -426,16 +426,16 @@ static int copy_files(void)
                return(EOM_EXIT_CODE);
        }
 
-       set_max_xmit(MAX(ibs, obs));
+       set_max_xmit(lp_ctx, MAX(ibs, obs));
 
        DEBUG(4, ("IO buffer size is %llu, max xmit is %d\n",
-                       (unsigned long long)iomax, lp_max_xmit()));
+                       (unsigned long long)iomax, lp_max_xmit(lp_ctx)));
 
-       if (!(ifile = open_file("if"))) {
+       if (!(ifile = open_file("if", lp_smb_ports(lp_ctx)))) {
                return(FILESYS_EXIT_CODE);
        }
 
-       if (!(ofile = open_file("of"))) {
+       if (!(ofile = open_file("of", lp_smb_ports(lp_ctx)))) {
                return(FILESYS_EXIT_CODE);
        }
 
@@ -443,7 +443,7 @@ static int copy_files(void)
        ifile->io_seek(ifile, check_arg_numeric("skip") * ibs);
        ofile->io_seek(ofile, check_arg_numeric("seek") * obs);
 
-       DEBUG(4, ("max xmit was negotiated to be %d\n", lp_max_xmit()));
+       DEBUG(4, ("max xmit was negotiated to be %d\n", lp_max_xmit(lp_ctx)));
 
        for (data_size = 0;;) {
 
@@ -549,9 +549,9 @@ int main(int argc, const char ** argv)
        set_arg_val("if", NULL);
        set_arg_val("of", NULL);
        /* Options. */
-       set_arg_val("direct", False);
-       set_arg_val("sync", False);
-       set_arg_val("oplock", False);
+       set_arg_val("direct", false);
+       set_arg_val("sync", false);
+       set_arg_val("oplock", false);
 
        pctx = poptGetContext(PROGNAME, argc, argv, poptions, 0);
        while ((i = poptGetNextOpt(pctx)) != -1) {
@@ -574,7 +574,7 @@ int main(int argc, const char ** argv)
                }
        }
 
-       gensec_init();
+       gensec_init(cmdline_lp_ctx);
        dump_args();
 
        if (check_arg_numeric("ibs") == 0 || check_arg_numeric("ibs") == 0) {
@@ -595,7 +595,7 @@ int main(int argc, const char ** argv)
 
        CatchSignal(SIGINT, dd_handle_signal);
        CatchSignal(SIGUSR1, dd_handle_signal);
-       return(copy_files());
+       return(copy_files(cmdline_lp_ctx));
 }
 
 /* vim: set sw=8 sts=8 ts=8 tw=79 : */