s3:utils: Use lpcfg_set_cmdline() in net

Signed-off-by: Pavel Kalugin <pkalugin@inno.tech>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 8272d8c4696178fb9851b32e284af6372640644d..3106463a2a14dc01625118641e857c022bd1c627 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -53,6 +53,7 @@
 #include "auth/credentials/credentials.h"
 #include "source3/utils/passwd_proto.h"
 #include "auth/gensec/gensec.h"
+#include "lib/param/param.h"
 
 #ifdef WITH_FAKE_KASERVER
 #include "utils/net_afs.h"
@@ -1263,8 +1264,9 @@ static struct functable net_func[] = {
                TALLOC_FREE(frame);
                exit(1);
        }
+       c->lp_ctx = samba_cmdline_get_lp_ctx();
        /* set default debug level to 0 regardless of what smb.conf sets */
-       lp_set_cmdline("log level", "0");
+       lpcfg_set_cmdline(c->lp_ctx, "log level", "0");
        c->private_data = net_func;
 
        pc = samba_popt_get_context(getprogname(),
@@ -1300,7 +1302,6 @@ static struct functable net_func[] = {
        }
 
        c->creds = samba_cmdline_get_creds();
-       c->lp_ctx = samba_cmdline_get_lp_ctx();
 
        {
                enum credentials_obtained username_obtained =
@@ -1353,7 +1354,7 @@ static struct functable net_func[] = {
        }
 
        if (c->opt_requester_name) {
-               lp_set_cmdline("netbios name", c->opt_requester_name);
+               lpcfg_set_cmdline(c->lp_ctx, "netbios name", c->opt_requester_name);
        }
 
        if (!c->opt_target_workgroup) {

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index a7f31ae1ac37e98525d0fde39a5df4ad71122b9b..04a3acc363645c020cb5d24425b1a7f55bef1e33 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -31,6 +31,7 @@
 #include "../librpc/gen_ndr/ndr_winreg.h"
 #include "util_tdb.h"
 #include "printing/nt_printing_migrate.h"
+#include "lib/param/param.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define FORMS_PREFIX_LEN 6
@@ -252,7 +253,7 @@ static int net_printing_dump(struct net_context *c, int argc,
        }
 
        if (o->encoding != NULL) {
-               lp_set_cmdline("dos charset", o->encoding);
+               lpcfg_set_cmdline(c->lp_ctx, "dos charset", o->encoding);
                d_fprintf(stderr, _("do string conversion from %s to %s\n"),
                                    lp_dos_charset(), lp_unix_charset());
                do_string_conversion = true;
@@ -357,7 +358,7 @@ static int net_printing_dump(struct net_context *c, int argc,
        ret = 0;
 
  done:
-       lp_set_cmdline("dos charset", save_dos_charset);
+       lpcfg_set_cmdline(c->lp_ctx, "dos charset", save_dos_charset);
        talloc_free(ctx);
        return ret;
 }
@@ -398,7 +399,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
        }
 
        if (o->encoding != NULL) {
-               lp_set_cmdline("dos charset", o->encoding);
+               lpcfg_set_cmdline(c->lp_ctx, "dos charset", o->encoding);
                d_fprintf(stderr, _("do string conversion from %s to %s\n"),
                                    lp_dos_charset(), lp_unix_charset());
                do_string_conversion = true;
@@ -522,7 +523,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
        status = NT_STATUS_OK;
 
  done:
-       lp_set_cmdline("dos charset", save_dos_charset);
+       lpcfg_set_cmdline(c->lp_ctx, "dos charset", save_dos_charset);
        talloc_free(tmp_ctx);
        return status;
 }

diff --git a/source3/utils/net_vfs.c b/source3/utils/net_vfs.c
index 0cdfc44b9b74ae46d867544863cc527149f017eb..410eef3106aaeca71c420325bcf9428de4e86fa1 100644 (file)
--- a/source3/utils/net_vfs.c
+++ b/source3/utils/net_vfs.c
@@ -143,7 +143,7 @@ static int net_vfs_init(struct net_context *c, int argc, const char **argv)
        umask(0);
        sec_init();
        setup_logging("net", DEBUG_STDOUT);
-       lp_set_cmdline("log level", "0");
+       lpcfg_set_cmdline(c->lp_ctx, "log level", "0");
 
        ok = lp_load_with_registry_shares(get_dyn_CONFIGFILE());
        if (!ok) {