sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

One more fix to get popt to work for some compilers...this is the downside to popt. Every option has to be in fixed storage.

Browse Source
This commit is contained in:
Jim McDonough 0001-01-01 00:00:00 +00:00
parent d31d2dcd22
commit e5e7132e80
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/rpcclient/rpcclient.c
View File

@ -552,34 +552,37 @@ static void usage(void)
extern char *optarg;
extern int optind;
extern pstring global_myname;
int got_pass = 0;
static int got_pass = 0;
BOOL interactive = True;
int opt;
int olddebug;
char *cmdstr = "";
static char *cmdstr = "";
struct cli_state *cli;
fstring password="",
username="",
domain="",
server="";
char *opt_authfile=NULL,
*opt_username=NULL,
*opt_domain=NULL,
*opt_configfile=NULL,
*opt_logfile=NULL;
pstring logfile;
struct cmd_set **cmd_set;
struct in_addr server_ip;
NTSTATUS nt_status;
extern BOOL AllowDebugChange;
static char *opt_authfile=NULL,
*opt_username=NULL,
*opt_domain=NULL,
*opt_configfile=NULL,
*opt_logfile=NULL;
static int opt_debuglevel;
pstring logfile;
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 */
poptContext pc;
struct poptOption long_options[] = {
{"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, &DEBUGLEVEL},
{"debuglevel", 'd', POPT_ARG_INT, &DEBUGLEVEL},
{"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},
@ -633,6 +636,10 @@ static void usage(void)
pstrcpy(dyn_CONFIGFILE, opt_configfile);
break;
case 'd':
DEBUGLEVEL = opt_debuglevel;
break;
case 'U': {
char *lp;
pstrcpy(username,opt_username);