X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Fclient%2Fclient.c;h=d9c3a7aa1b197b6c05628d247150cb27ccae434a;hb=4a090ba06a54f5da179ac02bb307cc03d08831bf;hp=e5a9592fcc079c0c8d6055022ebf5f480dab7d2f;hpb=e4202a9fe70785a0a5b47c90df696a880294d310;p=kai%2Fsamba.git

diff --git a/source3/client/client.c b/source3/client/client.c
index e5a9592fcc0..d9c3a7aa1b1 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3,6 +3,7 @@
    SMB client
    Copyright (C) Andrew Tridgell 1994-1998
    Copyright (C) Simo Sorce 2001-2002
+   Copyright (C) Jelmer Vernooij 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,28 +28,23 @@
 #define REGISTER 0
 #endif
 
-const char prog_name[] = "smbclient";
-
 struct cli_state *cli;
 extern BOOL in_client;
-extern BOOL AllowDebugChange;
 static int port = 0;
 pstring cur_dir = "\\";
 static pstring cd_path = "";
 static pstring service;
 static pstring desthost;
-static pstring password;
 static pstring username;
-static pstring workgroup;
-static char *cmdstr;
-static BOOL got_user;
+static pstring password;
+static BOOL use_kerberos;
 static BOOL got_pass;
+static char *cmdstr = NULL;
+
 static int io_bufsize = 64512;
-static BOOL use_kerberos;
 
 static int name_type = 0x20;
 static int max_protocol = PROTOCOL_NT1;
-extern pstring user_socket_options;
 
 static int process_tok(fstring tok);
 static int cmd_help(void);
@@ -663,7 +659,7 @@ static int do_get(char *rname, char *lname, BOOL reget)
 	GetTimeOfDay(&tp_start);
 
 	if (lowercase) {
-		strlower(lname);
+		strlower_m(lname);
 	}
 
 	fnum = cli_open(cli, rname, O_RDONLY, DENY_NONE);
@@ -838,7 +834,7 @@ static void do_mget(file_info *finfo)
 
 	unix_format(finfo->name);
 	if (lowercase)
-		strlower(finfo->name);
+		strlower_m(finfo->name);
 	
 	if (!directory_exist(finfo->name,NULL) && 
 	    mkdir(finfo->name,0777) != 0) {
@@ -1060,7 +1056,7 @@ static int do_put(char *rname, char *lname, BOOL reput)
 {
 	int fnum;
 	XFILE *f;
-	int start = 0;
+	size_t start = 0;
 	off_t nread = 0;
 	char *buf = NULL;
 	int maxwrite = io_bufsize;
@@ -1291,7 +1287,7 @@ static int file_find(struct file_list **list, const char *directory,
         int ret;
         char *path;
 	BOOL isdir;
-	char *dname;
+	const char *dname;
 
         dir = opendir(directory);
 	if (!dir) return -1;
@@ -2112,7 +2108,7 @@ static struct
   
   /* Yes, this must be here, see crh's comment above. */
   {"!",NULL,"run a shell command on the local system",{COMPL_NONE,COMPL_NONE}},
-  {"",NULL,NULL,{COMPL_NONE,COMPL_NONE}}
+  {NULL,NULL,NULL,{COMPL_NONE,COMPL_NONE}}
 };
 
 
@@ -2218,40 +2214,187 @@ static int process_command_string(char *cmd)
 	return rc;
 }	
 
-/****************************************************************************
-handle completion of commands for readline
-****************************************************************************/
-static char **completion_fn(char *text, int start, int end)
-{
 #define MAX_COMPLETIONS 100
-	char **matches;
-	int i, count=0;
 
-	/* for words not at the start of the line fallback to filename completion */
-	if (start) return NULL;
+typedef struct {
+	pstring dirmask;
+	char **matches;
+	int count, samelen;
+	const char *text;
+	int len;
+} completion_remote_t;
 
-	matches = (char **)malloc(sizeof(matches[0])*MAX_COMPLETIONS);
-	if (!matches) return NULL;
+static void completion_remote_filter(file_info *f, const char *mask, void *state)
+{
+	completion_remote_t *info = (completion_remote_t *)state;
 
-	matches[count++] = strdup(text);
-	if (!matches[0]) return NULL;
+	if ((info->count < MAX_COMPLETIONS - 1) && (strncmp(info->text, f->name, info->len) == 0) && (strcmp(f->name, ".") != 0) && (strcmp(f->name, "..") != 0)) {
+		if ((info->dirmask[0] == 0) && !(f->mode & aDIR))
+			info->matches[info->count] = strdup(f->name);
+		else {
+			pstring tmp;
 
-	for (i=0;commands[i].fn && count < MAX_COMPLETIONS-1;i++) {
-		if (strncmp(text, commands[i].name, strlen(text)) == 0) {
-			matches[count] = strdup(commands[i].name);
-			if (!matches[count]) return NULL;
-			count++;
+			if (info->dirmask[0] != 0)
+				pstrcpy(tmp, info->dirmask);
+			else
+				tmp[0] = 0;
+			pstrcat(tmp, f->name);
+			if (f->mode & aDIR)
+				pstrcat(tmp, "/");
+			info->matches[info->count] = strdup(tmp);
 		}
+		if (info->matches[info->count] == NULL)
+			return;
+		if (f->mode & aDIR)
+			smb_readline_ca_char(0);
+
+		if (info->count == 1)
+			info->samelen = strlen(info->matches[info->count]);
+		else
+			while (strncmp(info->matches[info->count], info->matches[info->count-1], info->samelen) != 0)
+				info->samelen--;
+		info->count++;
 	}
+}
+
+static char **remote_completion(const char *text, int len)
+{
+	pstring dirmask;
+	int i;
+	completion_remote_t info = { "", NULL, 1, 0, NULL, 0 };
+
+	/* can't have non-static intialisation on Sun CC, so do it
+	   at run time here */
+	info.samelen = len;
+	info.text = text;
+	info.len = len;
+		
+	if (len >= PATH_MAX)
+		return(NULL);
+
+	info.matches = (char **)malloc(sizeof(info.matches[0])*MAX_COMPLETIONS);
+	if (!info.matches) return NULL;
+	info.matches[0] = NULL;
 
-	if (count == 2) {
-		SAFE_FREE(matches[0]);
-		matches[0] = strdup(matches[1]);
+	for (i = len-1; i >= 0; i--)
+		if ((text[i] == '/') || (text[i] == '\\'))
+			break;
+	info.text = text+i+1;
+	info.samelen = info.len = len-i-1;
+
+	if (i > 0) {
+		strncpy(info.dirmask, text, i+1);
+		info.dirmask[i+1] = 0;
+		snprintf(dirmask, sizeof(dirmask), "%s%*s*", cur_dir, i-1, text);
+	} else
+		snprintf(dirmask, sizeof(dirmask), "%s*", cur_dir);
+
+	if (cli_list(cli, dirmask, aDIR | aSYSTEM | aHIDDEN, completion_remote_filter, &info) < 0)
+		goto cleanup;
+
+	if (info.count == 2)
+		info.matches[0] = strdup(info.matches[1]);
+	else {
+		info.matches[0] = malloc(info.samelen+1);
+		if (!info.matches[0])
+			goto cleanup;
+		strncpy(info.matches[0], info.matches[1], info.samelen);
+		info.matches[0][info.samelen] = 0;
 	}
-	matches[count] = NULL;
-	return matches;
+	info.matches[info.count] = NULL;
+	return info.matches;
+
+cleanup:
+	for (i = 0; i < info.count; i++)
+		free(info.matches[i]);
+	free(info.matches);
+	return NULL;
 }
 
+static char **completion_fn(const char *text, int start, int end)
+{
+	smb_readline_ca_char(' ');
+
+	if (start) {
+		const char *buf, *sp;
+		int i;
+		char compl_type;
+
+		buf = smb_readline_get_line_buffer();
+		if (buf == NULL)
+			return NULL;
+		
+		sp = strchr(buf, ' ');
+		if (sp == NULL)
+			return NULL;
+		
+		for (i = 0; commands[i].name; i++)
+			if ((strncmp(commands[i].name, text, sp - buf) == 0) && (commands[i].name[sp - buf] == 0))
+				break;
+		if (commands[i].name == NULL)
+			return NULL;
+
+		while (*sp == ' ')
+			sp++;
+
+		if (sp == (buf + start))
+			compl_type = commands[i].compl_args[0];
+		else
+			compl_type = commands[i].compl_args[1];
+
+		if (compl_type == COMPL_REMOTE)
+			return remote_completion(text, end - start);
+		else /* fall back to local filename completion */
+			return NULL;
+	} else {
+		char **matches;
+		int i, len, samelen, count=1;
+
+		matches = (char **)malloc(sizeof(matches[0])*MAX_COMPLETIONS);
+		if (!matches) return NULL;
+		matches[0] = NULL;
+
+		len = strlen(text);
+		for (i=0;commands[i].fn && count < MAX_COMPLETIONS-1;i++) {
+			if (strncmp(text, commands[i].name, len) == 0) {
+				matches[count] = strdup(commands[i].name);
+				if (!matches[count])
+					goto cleanup;
+				if (count == 1)
+					samelen = strlen(matches[count]);
+				else
+					while (strncmp(matches[count], matches[count-1], samelen) != 0)
+						samelen--;
+				count++;
+			}
+		}
+
+		switch (count) {
+		case 0:	/* should never happen */
+		case 1:
+			goto cleanup;
+		case 2:
+			matches[0] = strdup(matches[1]);
+			break;
+		default:
+			matches[0] = malloc(samelen+1);
+			if (!matches[0])
+				goto cleanup;
+			strncpy(matches[0], matches[1], samelen);
+			matches[0][samelen] = 0;
+		}
+		matches[count] = NULL;
+		return matches;
+
+cleanup:
+		while (i >= 0) {
+			free(matches[i]);
+			i--;
+		}
+		free(matches);
+		return NULL;
+	}
+}
 
 /****************************************************************************
 make sure we swallow keepalives during idle time
@@ -2270,6 +2413,10 @@ static void readline_callback(void)
 	last_t = t;
 
  again:
+
+	if (cli->fd == -1)
+		return;
+
 	FD_ZERO(&fds);
 	FD_SET(cli->fd,&fds);
 
@@ -2346,7 +2493,7 @@ static struct cli_state *do_connect(const char *server, const char *share)
 	char *sharename;
 	
 	/* make a copy so we don't modify the global string 'service' */
-	safe_strcpy(servicename, share, sizeof(servicename)-1);
+	fstrcpy(servicename, share);
 	sharename = servicename;
 	if (*sharename == '\\') {
 		server = sharename+2;
@@ -2411,11 +2558,14 @@ static struct cli_state *do_connect(const char *server, const char *share)
 	if (!cli_session_setup(c, username, 
 			       password, strlen(password),
 			       password, strlen(password),
-			       workgroup)) {
+			       lp_workgroup())) {
 		/* if a password was not supplied then try again with a null username */
 		if (password[0] || !username[0] || use_kerberos ||
-		    !cli_session_setup(c, "", "", 0, "", 0, workgroup)) { 
+		    !cli_session_setup(c, "", "", 0, "", 0, lp_workgroup())) { 
 			d_printf("session setup failed: %s\n", cli_errstr(c));
+			if (NT_STATUS_V(cli_nt_error(c)) == 
+			    NT_STATUS_V(NT_STATUS_MORE_PROCESSING_REQUIRED))
+				d_printf("did you forget to run kinit?\n");
 			cli_shutdown(c);
 			return NULL;
 		}
@@ -2434,24 +2584,9 @@ static struct cli_state *do_connect(const char *server, const char *share)
 
 	if (!cli_send_tconX(c, sharename, "?????",
 			    password, strlen(password)+1)) {
-		pstring full_share;
-
-		/*
-		 * Some servers require \\server\share for the share
-		 * while others are happy with share as we gave above
-		 * Lets see if we give it the long form if it works
-		 */
-		pstrcpy(full_share, "\\\\");
-		pstrcat(full_share, server);
-		pstrcat(full_share, "\\");
-		pstrcat(full_share, sharename);
-		if (!cli_send_tconX(c, full_share, "?????", password,
-					strlen(password) + 1)) {
-
-			d_printf("tree connect failed: %s\n", cli_errstr(c));
-			cli_shutdown(c);
-			return NULL;
-		}
+		d_printf("tree connect failed: %s\n", cli_errstr(c));
+		cli_shutdown(c);
+		return NULL;
 	}
 
 	DEBUG(4,(" tconx ok\n"));
@@ -2484,102 +2619,6 @@ static int process(char *base_directory)
 	return rc;
 }
 
-/****************************************************************************
-usage on the program
-****************************************************************************/
-static void usage(char *pname)
-{
-  d_printf("Usage: %s service <password> [options]", pname);
-
-  d_printf("\nVersion %s\n",VERSION);
-  d_printf("\t-s smb.conf           pathname to smb.conf file\n");
-  d_printf("\t-O socket_options     socket options to use\n");
-  d_printf("\t-R name resolve order use these name resolution services only\n");
-  d_printf("\t-M host               send a winpopup message to the host\n");
-  d_printf("\t-i scope              use this NetBIOS scope\n");
-  d_printf("\t-N                    don't ask for a password\n");
-  d_printf("\t-n netbios name.      Use this name as my netbios name\n");
-  d_printf("\t-d debuglevel         set the debuglevel\n");
-  d_printf("\t-p port               connect to the specified port\n");
-  d_printf("\t-l log basename.      Basename for log/debug files\n");
-  d_printf("\t-h                    Print this help message.\n");
-  d_printf("\t-I dest IP            use this IP to connect to\n");
-  d_printf("\t-E                    write messages to stderr instead of stdout\n");
-  d_printf("\t-k                    use kerberos (active directory) authentication\n");
-  d_printf("\t-U username           set the network username\n");
-  d_printf("\t-L host               get a list of shares available on a host\n");
-  d_printf("\t-t terminal code      terminal i/o code {sjis|euc|jis7|jis8|junet|hex}\n");
-  d_printf("\t-m max protocol       set the max protocol level\n");
-  d_printf("\t-A filename           get the credentials from a file\n");
-  d_printf("\t-W workgroup          set the workgroup name\n");
-  d_printf("\t-T<c|x>IXFqgbNan      command line tar\n");
-  d_printf("\t-D directory          start from directory\n");
-  d_printf("\t-c command string     execute semicolon separated commands\n");
-  d_printf("\t-b xmit/send buffer   changes the transmit/send buffer (default: 65520)\n");
-  d_printf("\n");
-}
-
-
-/****************************************************************************
-get a password from a a file or file descriptor
-exit on failure
-****************************************************************************/
-static void get_password_file(void)
-{
-	int fd = -1;
-	char *p;
-	BOOL close_it = False;
-	pstring spec;
-	char pass[128];
-		
-	if ((p = getenv("PASSWD_FD")) != NULL) {
-		pstrcpy(spec, "descriptor ");
-		pstrcat(spec, p);
-		sscanf(p, "%d", &fd);
-		close_it = False;
-	} else if ((p = getenv("PASSWD_FILE")) != NULL) {
-		fd = sys_open(p, O_RDONLY, 0);
-		pstrcpy(spec, p);
-		if (fd < 0) {
-			fprintf(stderr, "Error opening PASSWD_FILE %s: %s\n",
-				spec, strerror(errno));
-			exit(1);
-		}
-		close_it = True;
-	}
-
-	for(p = pass, *p = '\0'; /* ensure that pass is null-terminated */
-	    p && p - pass < sizeof(pass);) {
-		switch (read(fd, p, 1)) {
-		case 1:
-			if (*p != '\n' && *p != '\0') {
-				*++p = '\0'; /* advance p, and null-terminate pass */
-				break;
-			}
-		case 0:
-			if (p - pass) {
-				*p = '\0'; /* null-terminate it, just in case... */
-				p = NULL; /* then force the loop condition to become false */
-				break;
-			} else {
-				fprintf(stderr, "Error reading password from file %s: %s\n",
-					spec, "empty password\n");
-				exit(1);
-			}
-			
-		default:
-			fprintf(stderr, "Error reading password from file %s: %s\n",
-				spec, strerror(errno));
-			exit(1);
-		}
-	}
-	pstrcpy(password, pass);
-	if (close_it)
-		close(fd);
-}	
-
-
-
 /****************************************************************************
 handle a -L query
 ****************************************************************************/
@@ -2590,7 +2629,7 @@ static int do_host_query(char *query_host)
 		return 1;
 
 	browse_host(True);
-	list_servers(workgroup);
+	list_servers(lp_workgroup());
 
 	cli_shutdown(cli);
 	
@@ -2636,9 +2675,9 @@ static int do_message_op(void)
 	make_nmb_name(&calling, global_myname(), 0x0);
 	make_nmb_name(&called , desthost, name_type);
 
-	safe_strcpy(server_name, desthost, sizeof(server_name));
+	fstrcpy(server_name, desthost);
 	snprintf(name_type_hex, sizeof(name_type_hex), "#%X", name_type);
-	safe_strcat(server_name, name_type_hex, sizeof(server_name));
+	fstrcat(server_name, name_type_hex);
 
         zero_ip(&ip);
 	if (have_ip) ip = dest_ip;
@@ -2689,19 +2728,36 @@ static void remember_query_host(const char *arg,
  int main(int argc,char *argv[])
 {
 	fstring base_directory;
-	char *pname = argv[0];
 	int opt;
-	extern char *optarg;
-	extern int optind;
-	int old_debug;
 	pstring query_host;
 	BOOL message = False;
 	extern char tar_type;
 	pstring term_code;
-	pstring new_name_resolve_order;
-	pstring logfile;
+	static const char *new_name_resolve_order = NULL;
+	poptContext pc;
 	char *p;
 	int rc = 0;
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+
+		{ "name-resolve", 'R', POPT_ARG_STRING, &new_name_resolve_order, 'R', "Use these name resolution services only", "NAME-RESOLVE-ORDER" },
+		{ "message", 'M', POPT_ARG_STRING, NULL, 'M', "Send message", "HOST" },
+		{ "ip-address", 'I', POPT_ARG_STRING, NULL, 'I', "Use this IP to connect to", "IP" },
+		{ "stderr", 'E', POPT_ARG_NONE, NULL, 'E', "Write messages to stderr instead of stdout" },
+		{ "list", 'L', POPT_ARG_STRING, NULL, 'L', "Get a list of shares available on a host", "HOST" },
+		{ "terminal", 't', POPT_ARG_STRING, NULL, 't', "Terminal I/O code {sjis|euc|jis7|jis8|junet|hex}", "CODE" },
+		{ "max-protocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set the max protocol level", "LEVEL" },
+		{ "tar", 'T', POPT_ARG_STRING, NULL, 'T', "Command line tar", "<c|x>IXFqgbNan" },
+		{ "directory", 'D', POPT_ARG_STRING, NULL, 'D', "Start from directory", "DIR" },
+		{ "command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated commands" }, 
+		{ "send-buffer", 'b', POPT_ARG_INT, &io_bufsize, 'b', "Changes the transmit/send buffer", "BYTES" },
+		{ "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" },
+		POPT_COMMON_SAMBA
+		POPT_COMMON_CONNECTION
+		POPT_COMMON_CREDENTIALS
+		POPT_TABLEEND
+	};
+	
 
 #ifdef KANJI
 	pstrcpy(term_code, KANJI);
@@ -2712,306 +2768,104 @@ static void remember_query_host(const char *arg,
 	*query_host = 0;
 	*base_directory = 0;
 
-	*new_name_resolve_order = 0;
-
-	DEBUGLEVEL = 2;
-	AllowDebugChange = False;
- 
-	setup_logging(pname,True);
-
-	/*
-	 * If the -E option is given, be careful not to clobber stdout
-	 * before processing the options.  28.Feb.99, richard@hacom.nl.
-	 * Also pre-parse the -s option to get the service file name.
-	 */
+	setup_logging(argv[0],True);
 
-	for (opt = 1; opt < argc; opt++) {
-		if (strcmp(argv[opt], "-E") == 0)
-			dbf = x_stderr;
-		else if(strncmp(argv[opt], "-s", 2) == 0) {
-			if(argv[opt][2] != '\0')
-				pstrcpy(dyn_CONFIGFILE, &argv[opt][2]);
-			else if(argv[opt+1] != NULL) {
-				/*
-				 * At least one more arg left.
-				 */
-				pstrcpy(dyn_CONFIGFILE, argv[opt+1]);
-			} else {
-				usage(pname);
-				exit(1);
-			}
-		}
-	}
-
-	in_client = True;   /* Make sure that we tell lp_load we are */
-
-	old_debug = DEBUGLEVEL;
 	if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
-			prog_name, dyn_CONFIGFILE);
+			argv[0], dyn_CONFIGFILE);
 	}
-	DEBUGLEVEL = old_debug;
 	
-	pstrcpy(workgroup,lp_workgroup());
-
-	load_interfaces();
-
-	if (getenv("USER")) {
-		pstrcpy(username,getenv("USER"));
-
-		/* modification to support userid%passwd syntax in the USER var
-		   25.Aug.97, jdblair@uab.edu */
-
-		if ((p=strchr_m(username,'%'))) {
-			*p = 0;
-			pstrcpy(password,p+1);
-			got_pass = True;
-			memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
-		}
-	}
-
-	/* modification to support PASSWD environmental var
-	   25.Aug.97, jdblair@uab.edu */
-	if (getenv("PASSWD")) {
-		pstrcpy(password,getenv("PASSWD"));
-		got_pass = True;
-	}
-
-	if (getenv("PASSWD_FD") || getenv("PASSWD_FILE")) {
-		get_password_file();
-		got_pass = True;
-	}
-
-	if (*username == 0 && getenv("LOGNAME")) {
-		pstrcpy(username,getenv("LOGNAME"));
-	}
-
-	if (*username == 0) {
-		pstrcpy(username,"GUEST");
-	}
-
-	if (argc < 2) {
-		usage(pname);
-		exit(1);
-	}
+	pc = poptGetContext("smbclient", argc, (const char **) argv, long_options, 
+				POPT_CONTEXT_KEEP_FIRST);
+	poptSetOtherOptionHelp(pc, "service <password>");
 
-	/* FIXME: At the moment, if the user should happen to give the
-	 * options ahead of the service name (in standard Unix
-	 * fashion) then smbclient just spits out the usage message
-	 * with no explanation of what in particular was wrong.  Is
-	 * there any reason we can't just parse out the service name
-	 * and password after running getopt?? -- mbp */
-	if (*argv[1] != '-') {
-		pstrcpy(service,argv[1]);  
-		/* Convert any '/' characters in the service name to '\' characters */
-		string_replace( service, '/','\\');
-		argc--;
-		argv++;
-		
-		if (count_chars(service,'\\') < 3) {
-			usage(pname);
-			d_printf("\n%s: Not enough '\\' characters in service\n",service);
-			exit(1);
-		}
-
-		if (argc > 1 && (*argv[1] != '-')) {
-			got_pass = True;
-			pstrcpy(password,argv[1]);  
-			memset(argv[1],'X',strlen(argv[1]));
-			argc--;
-			argv++;
-		}
-	}
+	in_client = True;   /* Make sure that we tell lp_load we are */
 
-	while ((opt = 
-		getopt(argc, argv,"s:O:R:M:i:Nn:d:Pp:l:hI:EU:L:t:m:W:T:D:c:b:A:k")) != EOF) {
+	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
-		case 's':
-			pstrcpy(dyn_CONFIGFILE, optarg);
-			break;
-		case 'O':
-			pstrcpy(user_socket_options,optarg);
-			break;	
-		case 'R':
-			pstrcpy(new_name_resolve_order, optarg);
-			break;
 		case 'M':
 			/* Messages are sent to NetBIOS name type 0x3
 			 * (Messenger Service).  Make sure we default
 			 * to port 139 instead of port 445. srl,crh
 			 */
 			name_type = 0x03; 
-			pstrcpy(desthost,optarg);
-			if( 0 == port )
-				port = 139;
+			pstrcpy(desthost,poptGetOptArg(pc));
+			if( 0 == port ) port = 139;
  			message = True;
  			break;
- 		case 'i':
-			set_global_scope(optarg);
-			break;
-		case 'N':
-			got_pass = True;
-			break;
-		case 'n':
-			set_global_myname(optarg);
-			break;
-		case 'd':
-			if (*optarg == 'A')
-				DEBUGLEVEL = 10000;
-			else
-				DEBUGLEVEL = atoi(optarg);
-			break;
-		case 'P':
-			/* not needed anymore */
-			break;
-		case 'p':
-			port = atoi(optarg);
-			break;
-		case 'l':
-			slprintf(logfile,sizeof(logfile)-1, "%s.client",optarg);
-			lp_set_logfile(logfile);
-			break;
-		case 'h':
-			usage(pname);
-			exit(0);
-			break;
 		case 'I':
 			{
-				dest_ip = *interpret_addr2(optarg);
+				dest_ip = *interpret_addr2(poptGetOptArg(pc));
 				if (is_zero_ip(dest_ip))
 					exit(1);
 				have_ip = True;
 			}
 			break;
 		case 'E':
-			display_set_stderr();
 			dbf = x_stderr;
-			break;
-		case 'U':
-			{
-				char *lp;
-
-				got_user = True;
-				pstrcpy(username,optarg);
-				if ((lp=strchr_m(username,'%'))) {
-					*lp = 0;
-					pstrcpy(password,lp+1);
-					got_pass = True;
-					memset(strchr_m(optarg,'%')+1,'X',strlen(password));
-				}
-			}
-			break;
-
-		case 'A':
-			{
- 	 			XFILE *auth;
-        	                fstring buf;
-                        	uint16 len = 0;
-				char *ptr, *val, *param;
-                               
-	                        if ((auth=x_fopen(optarg, O_RDONLY, 0)) == NULL)
-				{
-					/* fail if we can't open the credentials file */
-					d_printf("ERROR: Unable to open credentials file!\n");
-					exit (-1);
-				}
-                                
-				while (!x_feof(auth))
-				{  
-					/* get a line from the file */
-					if (!x_fgets(buf, sizeof(buf), auth))
-						continue;
-					len = strlen(buf);
-					
-					if ((len) && (buf[len-1]=='\n'))
-					{
-						buf[len-1] = '\0';
-						len--;
-					}	
-					if (len == 0)
-						continue;
-					
-					/* break up the line into parameter & value.
-					   will need to eat a little whitespace possibly */
-					param = buf;
-					if (!(ptr = strchr_m (buf, '=')))
-						continue;
-					val = ptr+1;
-					*ptr = '\0';
-					
-					/* eat leading white space */
-					while ((*val!='\0') && ((*val==' ') || (*val=='\t')))
-						val++;
-					
-					if (strwicmp("password", param) == 0)
-					{
-						pstrcpy(password, val);
-						got_pass = True;
-					}
-					else if (strwicmp("username", param) == 0)
-						pstrcpy(username, val);
-					else if (strwicmp("domain", param) == 0)
-						pstrcpy(workgroup,val);
-					memset(buf, 0, sizeof(buf));
-				}
-				x_fclose(auth);
-			}
+			display_set_stderr();
 			break;
 
 		case 'L':
-			remember_query_host(optarg, query_host);
+			remember_query_host(poptGetOptArg(pc), query_host);
 			break;
 		case 't':
-			pstrcpy(term_code, optarg);
+			pstrcpy(term_code, poptGetOptArg(pc));
 			break;
 		case 'm':
-			max_protocol = interpret_protocol(optarg, max_protocol);
-			break;
-		case 'W':
-			pstrcpy(workgroup,optarg);
+			max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol);
 			break;
 		case 'T':
-			if (!tar_parseargs(argc, argv, optarg, optind)) {
-				usage(pname);
+			if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) {
+				poptPrintUsage(pc, stderr, 0);
 				exit(1);
 			}
 			break;
 		case 'D':
-			fstrcpy(base_directory,optarg);
-			break;
-		case 'c':
-			cmdstr = optarg;
+			fstrcpy(base_directory,poptGetOptArg(pc));
 			break;
-		case 'b':
-			io_bufsize = MAX(1, atoi(optarg));
-			break;
-		case 'k':
-#ifdef HAVE_KRB5
-			use_kerberos = True;
-#else
-			d_printf("No kerberos support compiled in\n");
-			exit(1);
-#endif
-			break;
-		default:
-			usage(pname);
+		}
+	}
+
+	poptGetArg(pc);
+	
+	load_interfaces();
+
+	if(poptPeekArg(pc)) {
+		pstrcpy(service,poptGetArg(pc));  
+		/* Convert any '/' characters in the service name to '\' characters */
+		string_replace(service, '/','\\');
+
+		if (count_chars(service,'\\') < 3) {
+			d_printf("\n%s: Not enough '\\' characters in service\n",service);
+			poptPrintUsage(pc, stderr, 0);
 			exit(1);
 		}
 	}
 
-	if (use_kerberos && !got_user)
-			got_pass = True;
+	if (poptPeekArg(pc)) { 
+		cmdline_auth_info.got_pass = True;
+		pstrcpy(cmdline_auth_info.password,poptGetArg(pc));  
+	}
 
 	init_names();
 
-	if(*new_name_resolve_order)
+	if(new_name_resolve_order)
 		lp_set_name_resolve_order(new_name_resolve_order);
 
 	if (!tar_type && !*query_host && !*service && !message) {
-		usage(pname);
+		poptPrintUsage(pc, stderr, 0);
 		exit(1);
 	}
 
+	poptFreeContext(pc);
+
+	pstrcpy(username, cmdline_auth_info.username);
+	pstrcpy(password, cmdline_auth_info.password);
+
+	use_kerberos = cmdline_auth_info.use_kerberos;
+	got_pass = cmdline_auth_info.got_pass;
+
 	DEBUG( 3, ( "Client started (version %s).\n", VERSION ) );
 
 	if (tar_type) {