diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-03-24 11:25:34 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-03-24 11:25:34 +0000 |
| commit | 11e9de855ca84af8d34a5f6459f304fcfa72dca3 (patch) | |
| tree | 0eb5d0505a50136ed74a4207219c42b9d4996402 /source3/client | |
| parent | 223828642548c7e25f6189e274aa1edcdfe30c4f (diff) | |
| download | samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.gz samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.bz2 samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.zip | |
Patch from metze to generalise POPT_COMMON_SAMBA, with some minor changes
(This used to be commit 2ddfed298d7f0b6e690275725a39c3ef107077ae)
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 9fb843cfba..8d6730cdc6 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -2589,15 +2589,7 @@ static void remember_query_host(const char *arg, int rc = 0; struct poptOption long_options[] = { POPT_AUTOHELP - POPT_COMMON_SAMBA - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_socket_options }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_log_base }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_netbios_name }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_scope }, - POPT_CREDENTIALS + { "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" }, @@ -2610,7 +2602,9 @@ static void remember_query_host(const char *arg, { "command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated commands" }, { "send-buffer", 'b', POPT_ARG_INT, NULL, 'b', "Changes the transmit/send buffer", "BYTES" }, { "port", 'p', POPT_ARG_INT, &port, 'p', "Port to connect to", "PORT" }, - { 0, 0, 0, 0 } + POPT_COMMON_SAMBA + POPT_CREDENTIALS + POPT_TABLEEND }; @@ -2720,7 +2714,7 @@ static void remember_query_host(const char *arg, pstrcpy(username, cmdline_auth_info.username); pstrcpy(password, cmdline_auth_info.password); - pstrcpy(workgroup, cmdline_auth_info.workgroup); + pstrcpy(workgroup, lp_workgroup()); use_kerberos = cmdline_auth_info.use_kerberos; got_pass = cmdline_auth_info.got_pass; |