diff options
author | Pavel Březina <pbrezina@redhat.com> | 2011-08-18 15:26:02 +0200 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-08-25 15:46:11 -0400 |
commit | 47db32cd9cb2147bb40909352569d7c8274365db (patch) | |
tree | 0f9b77fdae651e7e7cb4fb268c413c3146622931 /src/providers | |
parent | 89caf5edcc99f5731e89bd51e6ffaad3ec11c304 (diff) | |
download | sssd-47db32cd9cb2147bb40909352569d7c8274365db.tar.gz sssd-47db32cd9cb2147bb40909352569d7c8274365db.tar.bz2 sssd-47db32cd9cb2147bb40909352569d7c8274365db.zip |
--debug-timestamps=1 is not passed to providers
https://fedorahosted.org/sssd/ticket/972
--debug-timestamps=1 is now passed to providers
Diffstat (limited to 'src/providers')
-rw-r--r-- | src/providers/child_common.c | 14 | ||||
-rw-r--r-- | src/providers/proxy/proxy_auth.c | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/providers/child_common.c b/src/providers/child_common.c index 6e0f6a1a..cde310c3 100644 --- a/src/providers/child_common.c +++ b/src/providers/child_common.c @@ -378,7 +378,7 @@ static errno_t prepare_child_argv(TALLOC_CTX *mem_ctx, const char *binary, char ***_argv) { - uint_t argc = 3; /* program name, debug_level and NULL */ + uint_t argc = 4; /* program name, debug_level, debug_timestamps and NULL */ char ** argv; errno_t ret = EINVAL; @@ -387,7 +387,6 @@ static errno_t prepare_child_argv(TALLOC_CTX *mem_ctx, bool child_debug_timestamps = debug_timestamps; if (child_debug_to_file) argc++; - if (!child_debug_timestamps) argc++; /* program name, debug_level, * debug_to_file, debug_timestamps @@ -416,12 +415,11 @@ static errno_t prepare_child_argv(TALLOC_CTX *mem_ctx, } } - if (!child_debug_timestamps) { - argv[--argc] = talloc_strdup(argv, "--debug-timestamps=0"); - if (argv[argc] == NULL) { - ret = ENOMEM; - goto fail; - } + argv[--argc] = talloc_asprintf(argv, "--debug-timestamps=%d", + child_debug_timestamps); + if (argv[argc] == NULL) { + ret = ENOMEM; + goto fail; } argv[--argc] = talloc_strdup(argv, binary); diff --git a/src/providers/proxy/proxy_auth.c b/src/providers/proxy/proxy_auth.c index adb0d872..81ae896b 100644 --- a/src/providers/proxy/proxy_auth.c +++ b/src/providers/proxy/proxy_auth.c @@ -240,9 +240,8 @@ static struct tevent_req *proxy_child_init_send(TALLOC_CTX *mem_ctx, state->child_ctx = child_ctx; state->command = talloc_asprintf(req, - "%s/proxy_child -d %#.4x%s%s --domain %s --id %d", - SSSD_LIBEXEC_PATH, debug_level, - (debug_timestamps ? "" : " --debug-timestamps=0"), + "%s/proxy_child -d %#.4x --debug-timestamps=%d%s --domain %s --id %d", + SSSD_LIBEXEC_PATH, debug_level, debug_timestamps, (debug_to_file ? " --debug-to-files" : ""), auth_ctx->be->domain->name, child_ctx->id); |