diff options
| author | Tim Potter <tpot@samba.org> | 2002-09-05 02:00:14 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-09-05 02:00:14 +0000 |
| commit | 1974c5d92efe914a80339af75a2521b7141c97fe (patch) | |
| tree | f3d3f453f091fac157d45183d046fb11945edb16 /source3 | |
| parent | 2658e4ee23600e49a4231bc2b40c20a571c3f826 (diff) | |
| download | samba-1974c5d92efe914a80339af75a2521b7141c97fe.tar.gz samba-1974c5d92efe914a80339af75a2521b7141c97fe.tar.bz2 samba-1974c5d92efe914a80339af75a2521b7141c97fe.zip | |
The new popt_common_debug code obviates the need to muck around with
AllowDebugChange, saving the debuglevel across lp_load() calls etc.
(This used to be commit 561204905b78323fd0a03cc7ec5c9dbb2295bd5b)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 5f1f7a9f9a..880fdc599a 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -581,7 +581,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd) static int got_pass = 0; BOOL interactive = True; int opt; - int olddebug; static char *cmdstr = ""; const char *server; struct cli_state *cli; @@ -598,7 +597,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd) struct cmd_set **cmd_set; struct in_addr server_ip; NTSTATUS nt_status; - extern BOOL AllowDebugChange; /* make sure the vars that get altered (4th field) are in a fixed location or certain compilers complain */ @@ -619,9 +617,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd) setlinebuf(stdout); - DEBUGLEVEL = 1; - AllowDebugChange = False; - /* Parse options */ pc = poptGetContext("rpcclient", argc, (const char **) argv, @@ -697,12 +692,9 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd) reopen_logs(); /* Load smb.conf file */ - /* FIXME! How to get this DEBUGLEVEL to last over lp_load()? */ - olddebug = DEBUGLEVEL; - if (!lp_load(dyn_CONFIGFILE,True,False,False)) { + + if (!lp_load(dyn_CONFIGFILE,True,False,False)) fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE); - } - DEBUGLEVEL = olddebug; load_interfaces(); |