summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-06-05 19:24:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:31 -0500
commit39965d1993f854874d0f636ae14dbeb246c5b531 (patch)
treea66021e147f57dac0861151513b74658a723dd7f /source4
parent16fded604404835e2bb8e55518ff9d3c0e8857bb (diff)
downloadsamba-39965d1993f854874d0f636ae14dbeb246c5b531.tar.gz
samba-39965d1993f854874d0f636ae14dbeb246c5b531.tar.bz2
samba-39965d1993f854874d0f636ae14dbeb246c5b531.zip
r1034: Couple of small (popt) fixes
(This used to be commit 6fa0baa1c33b487f5f693483dd9b2664a0093b12)
Diffstat (limited to 'source4')
-rw-r--r--source4/client/client.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index 1d428a4f0e..db44dd3d28 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3,7 +3,7 @@
SMB client
Copyright (C) Andrew Tridgell 1994-1998
Copyright (C) Simo Sorce 2001-2002
- Copyright (C) Jelmer Vernooij 2003
+ Copyright (C) Jelmer Vernooij 2003-2004
Copyright (C) James J Myers 2003 <myersjj@samba.org>
This program is free software; you can redistribute it and/or modify
@@ -3039,9 +3039,8 @@ static void remember_query_host(const char *arg,
argv[0], dyn_CONFIGFILE);
}
- pc = poptGetContext("smbclient", argc, (const char **) argv, long_options,
- POPT_CONTEXT_KEEP_FIRST);
- poptSetOtherOptionHelp(pc, "service <password>");
+ pc = poptGetContext("smbclient", argc, (const char **) argv, long_options, 0);
+ poptSetOtherOptionHelp(pc, "[OPTIONS] service <password>");
in_client = True; /* Make sure that we tell lp_load we are */
@@ -3096,8 +3095,6 @@ static void remember_query_host(const char *arg,
}
}
- poptGetArg(pc);
-
load_interfaces();
if(poptPeekArg(pc)) {