summaryrefslogtreecommitdiff
path: root/source3/utils/smbcontrol.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-28 08:54:51 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-28 08:54:51 +0000
commitd031ba5c83d3243a7509692097c3a1a25aa34553 (patch)
tree2acdc279c9e497cb31d7ce703ba6fc696cb063ce /source3/utils/smbcontrol.c
parentd31cb1b4684e7b3288d5841bf206379ba8149e8a (diff)
downloadsamba-d031ba5c83d3243a7509692097c3a1a25aa34553.tar.gz
samba-d031ba5c83d3243a7509692097c3a1a25aa34553.tar.bz2
samba-d031ba5c83d3243a7509692097c3a1a25aa34553.zip
Merge compile and other fixes from 3.0 to HEAD.
Including smbtorture bugfixes, and a better TCONDEV test. Andrew Bartlett (This used to be commit 52c5806004022f153af7d022afdb3ec7cc0d2548)
Diffstat (limited to 'source3/utils/smbcontrol.c')
-rw-r--r--source3/utils/smbcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 8b984d9bd1..06add6af22 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -674,7 +674,7 @@ int main(int argc, char **argv)
poptContext pc;
int opt;
- struct poptOption wbinfo_options[] = {
+ static struct poptOption wbinfo_options[] = {
{ "timeout", 't', POPT_ARG_INT, &timeout, 't',
"Set timeout value in seconds", "TIMEOUT" },