s3-debug Remove last direct assignements to DEBUGLEVEL

All future assignments of the debug level should go via
lp_set_cmdline("log level", "x") because this will ensure the value is
not overwritten in an smb.conf load.

Andrew Bartlett

diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c
index 20835781ec06d6c0af9333d6e1151ce4fe9ecc78..f2f5aec6c46ff59052a45d4ed5d6cb361efbdb4d 100644 (file)
--- a/source3/libsmb/libsmb_setget.c
+++ b/source3/libsmb/libsmb_setget.c
@@ -90,8 +90,10 @@ smbc_getDebug(SMBCCTX *c)
 void
 smbc_setDebug(SMBCCTX *c, int debug)
 {
+       char buf[32];
+       snprintf(buf, sizeof(buf), "%d", debug);
         c->debug = debug;
-        DEBUGLEVEL = debug;
+       lp_set_cmdline("log level", buf); 
 }
 
 /**

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index a98f500e626b7a9fee48a34b3ed03a7b989020cf..707889a44fc91f74abe70e12c6f50778b0faed5a 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -324,7 +324,7 @@ static NTSTATUS cmd_debuglevel(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
        }
 
        if (argc == 2) {
-               DEBUGLEVEL = atoi(argv[1]);
+               lp_set_cmdline("log level", argv[1]);
        }
 
        printf("debuglevel is %d\n", DEBUGLEVEL);

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 335bc4ca22357b094edf5a8201f35d42e589e8d1..1fc46b9c2802a8cd6dd27245c135c9a3051dd360 100644 (file)
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -515,7 +515,7 @@ static void usage(void)
                        NumLoops = atoi(optarg);
                        break;
                case 'd':
-                       DEBUGLEVEL = atoi(optarg);
+                       lp_set_cmdline("log level", optarg);
                        break;
                case 'E':
                        die_on_error = 1;

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index bc4b58be739214aa8aeb79504d8cc92e59478719..161c6f9a6489a62c544c229f99da9c6cb9b4e52e 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -8009,7 +8009,7 @@ static void usage(void)
                        torture_numops = atoi(optarg);
                        break;
                case 'd':
-                       DEBUGLEVEL = atoi(optarg);
+                       lp_set_cmdline("log level", optarg);
                        break;
                case 'O':
                        sockops = optarg;

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 3b0ec54564c00ce73ecd0070c3c05d248b49e397..3ebe63ee536e64dadd0610f05668e18a50b5958e 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -188,7 +188,7 @@ static NTSTATUS cmd_debuglevel(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int a
        }
 
        if (argc == 2) {
-               DEBUGLEVEL = atoi(argv[1]);
+               lp_set_cmdline("log level", argv[1]);
        }
 
        printf("debuglevel is %d\n", DEBUGLEVEL);

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index c530c78f41fffd76b8152109fa06359808a0af7d..b4e8b19f1f8806f94af2d8c761fffbd9e3fb80fd 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -152,7 +152,7 @@ static int process_options(int argc, char **argv, int local_flags)
                        lp_set_name_resolve_order(optarg);
                        break;
                case 'D':
-                       DEBUGLEVEL = atoi(optarg);
+                       lp_set_cmdline("log level", optarg);
                        break;
                case 'U': {
                        got_username = True;