s3:utils: Migrate profiles to new cmdline option parser

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 8c7bd2cb0a4eb2106cb99e85fddac725a9894495..96b8c9dd82e041f9bad7861e4d94b4b16d795b07 100644 (file)
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "popt_common.h"
+#include "lib/cmdline/cmdline.h"
 #include "registry/reg_objects.h"
 #include "registry/regfio.h"
 #include "../libcli/security/security.h"
@@ -248,15 +248,29 @@ int main( int argc, const char *argv[] )
                POPT_TABLEEND
        };
        poptContext pc;
+       bool ok;
 
        smb_init_locale();
 
-       /* setup logging options */
-
-       setup_logging( "profiles", DEBUG_STDERR);
+       ok = samba_cmdline_init(frame,
+                               SAMBA_CMDLINE_CONFIG_CLIENT,
+                               false /* require_smbconf */);
+       if (!ok) {
+               DBG_ERR("Failed to init cmdline parser!\n");
+               TALLOC_FREE(frame);
+               exit(1);
+       }
 
-       pc = poptGetContext("profiles", argc, argv, long_options,
-               POPT_CONTEXT_KEEP_FIRST);
+       pc = samba_popt_get_context(getprogname(),
+                                   argc,
+                                   argv,
+                                   long_options,
+                                   POPT_CONTEXT_KEEP_FIRST);
+       if (pc == NULL) {
+               DBG_ERR("Failed to setup popt context!\n");
+               TALLOC_FREE(frame);
+               exit(1);
+       }
 
        poptSetOtherOptionHelp(pc, "<profilefile>");
 

diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index bcc2261d82c726172350127db95f7762e8d4233f..c28fd862b3a5bd48e7098d0e7bea2d0b65d5b694 100644 (file)
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA3_BINARY('profiles',
                  source='profiles.c',
                  deps='''
                  talloc
-                 popt_samba3
+                 CMDLINE_S3
                  smbconf
                  REGFIO''')