summaryrefslogtreecommitdiff
path: root/source4/client/client.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-10 18:08:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-10 18:08:00 +0200
commit7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34 (patch)
treebd2cbe93e80692486c969a80cfececbf8bb6dcdd /source4/client/client.c
parentcc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31 (diff)
parentbc4eacb5d89ca8dca123e2d6bd6eba47ed93b771 (diff)
downloadsamba-7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34.tar.gz
samba-7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34.tar.bz2
samba-7b45a4d7fafd7ffa848ababf3f70d19bc1b1ac34.zip
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts: source/auth/config.mk source/auth/gensec/config.mk source/torture/smbtorture.c (This used to be commit edfd02e59bba86b977bd60848f57a614691fff7a)
Diffstat (limited to 'source4/client/client.c')
-rw-r--r--source4/client/client.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index 79cc1b5382..120a80ccd2 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3124,11 +3124,6 @@ static int do_message_op(const char *netbios_name, const char *desthost,
const char *query_host = NULL;
bool message = false;
const char *desthost = NULL;
-#ifdef KANJI
- const char *term_code = KANJI;
-#else
- const char *term_code = "";
-#endif /* KANJI */
poptContext pc;
const char *service = NULL;
int port = 0;
@@ -3148,7 +3143,6 @@ static int do_message_op(const char *netbios_name, const char *desthost,
{ "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" },
{ "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, NULL, 'b', "Changes the transmit/send buffer", "BYTES" },
@@ -3190,9 +3184,6 @@ static int do_message_op(const char *netbios_name, const char *desthost,
case 'L':
query_host = strdup(poptGetOptArg(pc));
break;
- case 't':
- term_code = strdup(poptGetOptArg(pc));
- break;
case 'D':
base_directory = strdup(poptGetOptArg(pc));
break;