diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2002-08-17 15:33:49 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2002-08-17 15:33:49 +0000 |
| commit | 64c53e819b53035ff07f9fa00ca4daef18138f51 (patch) | |
| tree | 0d4bf39c4c21d5d7004ad92a2be7772eac1af23f /source3/rpcclient/rpcclient.c | |
| parent | 127e77e6e334fdc33086bffcbe00d340c0ba0097 (diff) | |
| download | samba-64c53e819b53035ff07f9fa00ca4daef18138f51.tar.gz samba-64c53e819b53035ff07f9fa00ca4daef18138f51.tar.bz2 samba-64c53e819b53035ff07f9fa00ca4daef18138f51.zip | |
sync 3.0 branch with HEAD
(This used to be commit 6497eb78e87a6ffa4c2c61aa4ef6ecd451821a27)
Diffstat (limited to 'source3/rpcclient/rpcclient.c')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index a62c3d8365..2d86fb1d3d 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -612,7 +612,6 @@ static void usage(void) *opt_configfile=NULL, *opt_logfile=NULL, *opt_ipaddr=NULL; - static int opt_debuglevel; pstring logfile; struct cmd_set **cmd_set; struct in_addr server_ip; @@ -626,14 +625,13 @@ static void usage(void) {"authfile", 'A', POPT_ARG_STRING, &opt_authfile, 'A'}, {"conf", 's', POPT_ARG_STRING, &opt_configfile, 's'}, {"nopass", 'N', POPT_ARG_NONE, &got_pass}, - {"debug", 'd', POPT_ARG_INT, &opt_debuglevel, 'd'}, - {"debuglevel", 'd', POPT_ARG_INT, &opt_debuglevel, 'd'}, {"user", 'U', POPT_ARG_STRING, &opt_username, 'U'}, {"workgroup", 'W', POPT_ARG_STRING, &opt_domain, 'W'}, {"command", 'c', POPT_ARG_STRING, &cmdstr}, {"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l'}, {"help", 'h', POPT_ARG_NONE, 0, 'h'}, {"dest-ip", 'I', POPT_ARG_STRING, &opt_ipaddr, 'I'}, + { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, { NULL } }; @@ -673,10 +671,6 @@ static void usage(void) pstrcpy(dyn_CONFIGFILE, opt_configfile); break; - case 'd': - DEBUGLEVEL = opt_debuglevel; - break; - case 'U': { char *lp; @@ -768,7 +762,7 @@ static void usage(void) password, 0); if (!NT_STATUS_IS_OK(nt_status)) { - DEBUG(1,("Cannot connect to server. Error was %s\n", nt_errstr(nt_status))); + DEBUG(0,("Cannot connect to server. Error was %s\n", nt_errstr(nt_status))); return 1; } |