diff options
Diffstat (limited to 'src/providers')
-rw-r--r-- | src/providers/child_common.c | 21 | ||||
-rw-r--r-- | src/providers/krb5/krb5_child.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/ldap_child.c | 2 | ||||
-rw-r--r-- | src/providers/proxy/proxy_auth.c | 5 |
4 files changed, 24 insertions, 6 deletions
diff --git a/src/providers/child_common.c b/src/providers/child_common.c index cde310c3..5920ebc7 100644 --- a/src/providers/child_common.c +++ b/src/providers/child_common.c @@ -378,19 +378,25 @@ static errno_t prepare_child_argv(TALLOC_CTX *mem_ctx, const char *binary, char ***_argv) { - uint_t argc = 4; /* program name, debug_level, debug_timestamps and NULL */ + /* + * program name, debug_level, debug_timestamps, + * debug_microseconds and NULL + */ + uint_t argc = 5; char ** argv; errno_t ret = EINVAL; /* Save the current state in case an interrupt changes it */ bool child_debug_to_file = debug_to_file; bool child_debug_timestamps = debug_timestamps; + bool child_debug_microseconds = debug_microseconds; if (child_debug_to_file) argc++; - /* program name, debug_level, - * debug_to_file, debug_timestamps - * and NULL */ + /* + * program name, debug_level, debug_to_file, debug_timestamps, + * debug_microseconds and NULL + */ argv = talloc_array(mem_ctx, char *, argc); if (argv == NULL) { DEBUG(1, ("talloc_array failed.\n")); @@ -422,6 +428,13 @@ static errno_t prepare_child_argv(TALLOC_CTX *mem_ctx, goto fail; } + argv[--argc] = talloc_asprintf(argv, "--debug-microseconds=%d", + child_debug_microseconds); + if (argv[argc] == NULL) { + ret = ENOMEM; + goto fail; + } + argv[--argc] = talloc_strdup(argv, binary); if (argv[argc] == NULL) { ret = ENOMEM; diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index fc678efa..7f6f9367 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -1554,6 +1554,8 @@ int main(int argc, const char *argv[]) _("Debug level"), NULL}, {"debug-timestamps", 0, POPT_ARG_INT, &debug_timestamps, 0, _("Add debug timestamps"), NULL}, + {"debug-microseconds", 0, POPT_ARG_INT, &debug_microseconds, 0, + _("Show timestamps with microseconds"), NULL}, {"debug-fd", 0, POPT_ARG_INT, &debug_fd, 0, _("An open file descriptor for the debug logs"), NULL}, POPT_TABLEEND diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index 368c2012..b0051fa9 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -360,6 +360,8 @@ int main(int argc, const char *argv[]) _("Debug level"), NULL}, {"debug-timestamps", 0, POPT_ARG_INT, &debug_timestamps, 0, _("Add debug timestamps"), NULL}, + {"debug-microseconds", 0, POPT_ARG_INT, &debug_microseconds, 0, + _("Show timestamps with microseconds"), NULL}, {"debug-fd", 0, POPT_ARG_INT, &debug_fd, 0, _("An open file descriptor for the debug logs"), NULL}, POPT_TABLEEND diff --git a/src/providers/proxy/proxy_auth.c b/src/providers/proxy/proxy_auth.c index 81ae896b..cd291782 100644 --- a/src/providers/proxy/proxy_auth.c +++ b/src/providers/proxy/proxy_auth.c @@ -240,9 +240,10 @@ 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 --debug-timestamps=%d%s --domain %s --id %d", + "%s/proxy_child -d %#.4x --debug-timestamps=%d " + "--debug-microseconds=%d%s --domain %s --id %d", SSSD_LIBEXEC_PATH, debug_level, debug_timestamps, - (debug_to_file ? " --debug-to-files" : ""), + debug_microseconds, (debug_to_file ? " --debug-to-files" : ""), auth_ctx->be->domain->name, child_ctx->id); if (state->command == NULL) { |