diff options
| author | Andreas Schneider <asn@samba.org> | 2021-01-12 12:58:24 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-05-20 03:49:30 +0000 |
| commit | 09fed102c584caa5587df7bebde317f0dc51fbb7 (patch) | |
| tree | 0a08286f8f8c87a2c6a1e8b66d5198c8aab7e5a5 | |
| parent | de159c40c5be8862270ca07b40c522cd9bacf6f4 (diff) | |
| download | samba-09fed102c584caa5587df7bebde317f0dc51fbb7.tar.gz | |
s3:utils: Migrate tevent_glib_tracker to new cmdline option parser
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu May 20 03:49:30 UTC 2021 on sn-devel-184
| -rw-r--r-- | source3/utils/async-tracker.c | 24 | ||||
| -rw-r--r-- | source3/wscript_build | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/source3/utils/async-tracker.c b/source3/utils/async-tracker.c index f45c0953238..fff85989473 100644 --- a/source3/utils/async-tracker.c +++ b/source3/utils/async-tracker.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/util/debug.h" -#include "popt_common.h" +#include "lib/cmdline/cmdline.h" #include "param.h" /* * glib uses TRUE and FALSE which was redefined by "includes.h" to be @@ -205,6 +205,7 @@ int main(int argc, const char **argv) struct test_state *state = NULL; int c; poptContext pc; + bool ok; struct poptOption long_options[] = { POPT_AUTOHELP { @@ -222,6 +223,7 @@ int main(int argc, const char **argv) .descrip = "Use glib loop", }, POPT_COMMON_SAMBA + POPT_COMMON_VERSION POPT_TABLEEND }; @@ -237,17 +239,25 @@ int main(int argc, const char **argv) state->loop_type = TEVENT_LOOP; - setup_logging(argv[0], DEBUG_STDERR); smb_init_locale(); - if (!lp_load_client(get_dyn_CONFIGFILE())) { - fprintf(stderr, "ERROR: Can't load %s\n", - get_dyn_CONFIGFILE()); + ok = samba_cmdline_init(mem_ctx, + SAMBA_CMDLINE_CONFIG_CLIENT, + true /* require_smbconf */); + if (!ok) { + TALLOC_FREE(mem_ctx); exit(1); } - pc = poptGetContext(NULL, 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) { + TALLOC_FREE(mem_ctx); + exit(1); + } while ((c = poptGetNextOpt(pc)) != -1) { switch (c) { diff --git a/source3/wscript_build b/source3/wscript_build index fd7f614cf5d..67569c0dbe5 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1404,7 +1404,7 @@ bld.SAMBA3_BINARY('tevent_glib_tracker', deps=''' talloc libsmb - popt_samba3 + CMDLINE_S3 tevent-glib-glue ''' + bld.env['libtracker'], enabled=bld.CONFIG_SET('HAVE_TRACKER') and bld.CONFIG_SET('WITH_TEVENT_GLIB_GLUE'), install=False) |