sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

The new popt_common_debug code obviates the need to muck around with

Browse Source 
AllowDebugChange, saving the debuglevel across lp_load() calls etc.
(This used to be commit 561204905b78323fd0a03cc7ec5c9dbb2295bd5b)
This commit is contained in:
Tim Potter 2002-09-05 02:00:14 +00:00
parent 2658e4ee23
commit 1974c5d92e
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/rpcclient/rpcclient.c
View File

@ -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();