Fix -s option to smbcontrol (#908)

(This used to be commit 7495395c1cc3b09b27d6eeb7dff6f214701d03d6)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 8d2067a32639dadab574f7a4f5496acbdddc7478..bd7e7271bb35f884b3644fd471cccbf2600e7e70 100644 (file)
--- 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 eae1f97b58bedabb4c30d9c85c77643941bf3740..8a27684a4d377142cbef4a8d1b670dda42846148 100644 (file)
--- 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: