summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-01-06 20:01:48 +0000
committerJelmer Vernooij <jelmer@samba.org>2004-01-06 20:01:48 +0000
commitbd4304476b8aa5cc48df8fd045af66528ea3f204 (patch)
tree59e7cf695f7c687713e1d3ebd363c7a05fe0a16f
parentd86628d0628a064f58e3ce9fbaf55ad9d5a92540 (diff)
downloadsamba-bd4304476b8aa5cc48df8fd045af66528ea3f204.tar.gz
samba-bd4304476b8aa5cc48df8fd045af66528ea3f204.tar.bz2
samba-bd4304476b8aa5cc48df8fd045af66528ea3f204.zip
Fix -s option to smbcontrol (#908)
(This used to be commit 7495395c1cc3b09b27d6eeb7dff6f214701d03d6)
-rw-r--r--WHATSNEW.txt1
-rw-r--r--source3/utils/smbcontrol.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 8d2067a326..bd7e7271bb 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -142,6 +142,7 @@ o J. Tournier <jerome.tournier@IDEALX.com>
o Jelmer Vernooij <jelmer@samba.org>
* Put functions for generating SQL queries in pdb_sql.c
* Add pgSQL backend (based on patch by Hamish Friedlander)
+ * Fix -s option to smbcontrol (#908)
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index eae1f97b58..8a27684a4d 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -717,7 +717,7 @@ int main(int argc, const char **argv)
argc -= 2;
break;
case 's': /* --configfile */
- pstrcpy(dyn_CONFIGFILE, optarg);
+ pstrcpy(dyn_CONFIGFILE, poptGetOptArg(pc));
argc -= 2;
break;
default: