Attachment 577155 Details for Bug 811113 – Updated for Stephen's initial review

[patch] Updated for Stephen's initial review

Move-some-debug-lines-to-new-debug-log-levels.patch (text/plain), 11.28 KB, created by Stef Walter on 2012-04-12 18:58:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2012-04-12 18:58:40 UTC

Size: 11.28 KB

patch

obsolete

>From a1f9e093b3a0b607535c2c5bb95545b8557c5ea3 Mon Sep 17 00:00:00 2001
>From: Stef Walter <stefw@gnome.org>
>Date: Tue, 10 Apr 2012 11:06:56 +0200
>Subject: [PATCH] Move some debug lines to new debug log levels
>
> * These are common lines of debug output when starting
>   up sssd
>
>https://bugzilla.redhat.com/show_bug.cgi?id=811113
>---
> src/confdb/confdb.c                     |    2 +-
> src/monitor/monitor.c                   |    4 ++--
> src/providers/data_provider_be.c        |    2 +-
> src/providers/fail_over.c               |   12 ++++++------
> src/providers/krb5/krb5_common.c        |    6 +++---
> src/providers/krb5/krb5_init.c          |    2 +-
> src/providers/ldap/ldap_common.c        |    2 +-
> src/providers/ldap/ldap_init.c          |    2 +-
> src/providers/simple/simple_access.c    |    4 ++--
> src/responder/common/responder_common.c |    2 +-
> src/responder/nss/nsssrv.c              |    2 +-
> src/sbus/sssd_dbus_server.c             |    2 +-
> src/util/check_and_open.c               |    4 ++--
> src/util/server.c                       |    6 +++---
> src/util/sss_krb5.c                     |    2 +-
> 15 files changed, 27 insertions(+), 27 deletions(-)
>
>diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
>index 04f02b5..f22b53a 100644
>--- a/src/confdb/confdb.c
>+++ b/src/confdb/confdb.c
>@@ -807,7 +807,7 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb,
>         }
>     }
>     if (!domain->enumerate) {
>-        DEBUG(1, ("No enumeration for [%s]!\n", domain->name));
>+        DEBUG(SSSDBG_TRACE_FUNC, ("No enumeration for [%s]!\n", domain->name));
>     }
> 
>     /* Determine if user/group names will be Fully Qualified
>diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
>index a93b234..5786201 100644
>--- a/src/monitor/monitor.c
>+++ b/src/monitor/monitor.c
>@@ -2059,7 +2059,7 @@ static int monitor_service_init(struct sbus_connection *conn, void *data)
>     struct mon_init_conn *mini;
>     struct timeval tv;
> 
>-    DEBUG(3, ("Initializing D-BUS Service\n"));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("Initializing D-BUS Service\n"));
> 
>     ctx = talloc_get_type(data, struct mt_ctx);
> 
>@@ -2428,7 +2428,7 @@ int main(int argc, const char *argv[])
> 
>     uid = getuid();
>     if (uid != 0) {
>-        DEBUG(1, ("Running under %d, must be root\n", uid));
>+        DEBUG(SSSDBG_FATAL_FAILURE, ("Running under %d, must be root\n", uid));
>         sss_log(SSS_LOG_ALERT, "sssd must be run as root");
>         return 8;
>     }
>diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
>index 695dee0..74e2cc4 100644
>--- a/src/providers/data_provider_be.c
>+++ b/src/providers/data_provider_be.c
>@@ -1989,7 +1989,7 @@ int main(int argc, const char *argv[])
>         return 3;
>     }
> 
>-    DEBUG(1, ("Backend provider (%s) started!\n", be_domain));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("Backend provider (%s) started!\n", be_domain));
> 
>     /* loop on main */
>     server_loop(main_ctx);
>diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c
>index 637b5b4..e93d2a6 100644
>--- a/src/providers/fail_over.c
>+++ b/src/providers/fail_over.c
>@@ -143,8 +143,8 @@ fo_context_init(TALLOC_CTX *mem_ctx, struct fo_options *opts)
>     ctx->opts->family_order  = opts->family_order;
>     ctx->opts->service_resolv_timeout = opts->service_resolv_timeout;
> 
>-    DEBUG(3, ("Created new fail over context, retry timeout is %d\n",
>-              ctx->opts->retry_timeout));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("Created new fail over context, retry timeout is %d\n",
>+                              ctx->opts->retry_timeout));
>     return ctx;
> }
> 
>@@ -397,7 +397,7 @@ fo_new_service(struct fo_ctx *ctx, const char *name,
>     struct fo_service *service;
>     int ret;
> 
>-    DEBUG(3, ("Creating new service '%s'\n", name));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("Creating new service '%s'\n", name));
>     ret = fo_get_service(ctx, name, &service);
>     if (ret == EOK) {
>         DEBUG(5, ("Service '%s' already exists\n", name));
>@@ -514,9 +514,9 @@ fo_add_srv_server(struct fo_service *service, const char *srv,
> {
>     struct fo_server *server;
> 
>-    DEBUG(3, ("Adding new SRV server in domain '%s', to service '%s' using %s\n",
>-              discovery_domain ? discovery_domain : "unknown",
>-              service->name, proto));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("Adding new SRV server in domain '%s', to service '%s' using %s\n",
>+                              discovery_domain ? discovery_domain : "unknown",
>+                              service->name, proto));
> 
>     DLIST_FOR_EACH(server, service->server_list) {
>         if (server->user_data != user_data)
>diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c
>index 104d613..be7dfc1 100644
>--- a/src/providers/krb5/krb5_common.c
>+++ b/src/providers/krb5/krb5_common.c
>@@ -181,13 +181,13 @@ errno_t check_and_export_options(struct dp_option *opts,
> 
>     dummy = dp_opt_get_cstring(opts, KRB5_KDC);
>     if (dummy == NULL) {
>-        DEBUG(1, ("No KDC explicitly configured, using defaults.\n"));
>+        DEBUG(SSSDBG_CONF_SETTINGS, ("No KDC explicitly configured, using defaults.\n"));
>     }
> 
>     dummy = dp_opt_get_cstring(opts, KRB5_KPASSWD);
>     if (dummy == NULL) {
>-        DEBUG(1, ("No kpasswd server explicitly configured, "
>-                  "using the KDC or defaults.\n"));
>+        DEBUG(SSSDBG_CONF_SETTINGS, ("No kpasswd server explicitly configured, "
>+                                     "using the KDC or defaults.\n"));
>     }
> 
>     dummy = dp_opt_get_cstring(opts, KRB5_CCNAME_TMPL);
>diff --git a/src/providers/krb5/krb5_init.c b/src/providers/krb5/krb5_init.c
>index 3c39d84..fbea87d 100644
>--- a/src/providers/krb5/krb5_init.c
>+++ b/src/providers/krb5/krb5_init.c
>@@ -101,7 +101,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx,
> 
>     krb5_servers = dp_opt_get_string(ctx->opts, KRB5_KDC);
>     if (krb5_servers == NULL) {
>-        DEBUG(1, ("Missing krb5_server option, using service discovery!\n"));
>+        DEBUG(SSSDBG_CONF_SETTINGS, ("Missing krb5_server option, using service discovery!\n"));
>     }
> 
>     krb5_realm = dp_opt_get_string(ctx->opts, KRB5_REALM);
>diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
>index 69d1bc2..aac9f3c 100644
>--- a/src/providers/ldap/ldap_common.c
>+++ b/src/providers/ldap/ldap_common.c
>@@ -1272,7 +1272,7 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx,
> 
>     krb5_servers = dp_opt_get_string(opts, SDAP_KRB5_KDC);
>     if (krb5_servers == NULL) {
>-        DEBUG(1, ("Missing krb5_server option, using service discovery!\n"));
>+        DEBUG(SSSDBG_CONF_SETTINGS, ("Missing krb5_server option, using service discovery!\n"));
>     }
> 
>     krb5_opt_realm = dp_opt_get_string(opts, SDAP_KRB5_REALM);
>diff --git a/src/providers/ldap/ldap_init.c b/src/providers/ldap/ldap_init.c
>index f55e94b..822c9c8 100644
>--- a/src/providers/ldap/ldap_init.c
>+++ b/src/providers/ldap/ldap_init.c
>@@ -117,7 +117,7 @@ int sssm_ldap_id_init(struct be_ctx *bectx,
> 
>     urls = dp_opt_get_string(ctx->opts->basic, SDAP_URI);
>     if (!urls) {
>-        DEBUG(1, ("Missing ldap_uri, will use service discovery\n"));
>+        DEBUG(SSSDBG_CONF_SETTINGS, ("Missing ldap_uri, will use service discovery\n"));
>     }
> 
>     ret = sdap_service_init(ctx, ctx->be, "LDAP",
>diff --git a/src/providers/simple/simple_access.c b/src/providers/simple/simple_access.c
>index 06662e9..8571abe 100644
>--- a/src/providers/simple/simple_access.c
>+++ b/src/providers/simple/simple_access.c
>@@ -358,8 +358,8 @@ int sssm_simple_access_init(struct be_ctx *bectx, struct bet_ops **ops,
>             !ctx->allow_groups &&
>             !ctx->deny_users &&
>             !ctx->deny_groups) {
>-        DEBUG(1, ("No rules supplied for simple access provider. "
>-                  "Access will be granted for all users.\n"));
>+        DEBUG(SSSDBG_OP_FAILURE, ("No rules supplied for simple access provider. "
>+                                  "Access will be granted for all users.\n"));
>     }
> 
>     *ops = &simple_access_ops;
>diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
>index a9b5d56..58c9c1c 100644
>--- a/src/responder/common/responder_common.c
>+++ b/src/responder/common/responder_common.c
>@@ -599,7 +599,7 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
>         return ret;
>     }
> 
>-    DEBUG(1, ("Responder Initialization complete\n"));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("Responder Initialization complete\n"));
> 
>     *responder_ctx = rctx;
>     return EOK;
>diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c
>index f97898d..914f559 100644
>--- a/src/responder/nss/nsssrv.c
>+++ b/src/responder/nss/nsssrv.c
>@@ -322,7 +322,7 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
>     }
>     responder_set_fd_limit(fd_limit);
> 
>-    DEBUG(1, ("NSS Initialization complete\n"));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("NSS Initialization complete\n"));
> 
>     return EOK;
> }
>diff --git a/src/sbus/sssd_dbus_server.c b/src/sbus/sssd_dbus_server.c
>index 57fa0e4..2255d19 100644
>--- a/src/sbus/sssd_dbus_server.c
>+++ b/src/sbus/sssd_dbus_server.c
>@@ -266,7 +266,7 @@ int sbus_new_server(TALLOC_CTX *mem_ctx,
>     }
> 
>     tmp = dbus_server_get_address(dbus_server);
>-    DEBUG(3, ("D-BUS Server listening on %s\n", tmp));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("D-BUS Server listening on %s\n", tmp));
>     free(tmp);
> 
>     server = talloc_zero(tmp_ctx, struct sbus_connection);
>diff --git a/src/util/check_and_open.c b/src/util/check_and_open.c
>index 27ef1c8..c626191 100644
>--- a/src/util/check_and_open.c
>+++ b/src/util/check_and_open.c
>@@ -50,8 +50,8 @@ errno_t check_file(const char *filename, const int uid, const int gid,
>     ret = follow_symlink ? stat(filename, stat_buf) : \
>                            lstat(filename, stat_buf);
>     if (ret == -1) {
>-        DEBUG(1, ("lstat for [%s] failed: [%d][%s].\n", filename, errno,
>-                                                        strerror(errno)));
>+        DEBUG(SSSDBG_TRACE_FUNC, ("lstat for [%s] failed: [%d][%s].\n", filename, errno,
>+                                                                        strerror(errno)));
>         return errno;
>     }
> 
>diff --git a/src/util/server.c b/src/util/server.c
>index 95b1836..19837fb 100644
>--- a/src/util/server.c
>+++ b/src/util/server.c
>@@ -409,8 +409,8 @@ int server_setup(const char *name, int flags,
>     if (flags & FLAGS_PID_FILE) {
>         ret = pidfile(PID_PATH, name);
>         if (ret != EOK) {
>-            DEBUG(0, ("Error creating pidfile! (%d [%s])\n",
>-                      ret, strerror(ret)));
>+            DEBUG(SSSDBG_FATAL_FAILURE, ("Error creating pidfile: %s/%s! (%d [%s])\n",
>+                                         PID_PATH, name, ret, strerror(ret)));
>             return ret;
>         }
>     }
>@@ -544,7 +544,7 @@ int server_setup(const char *name, int flags,
> 
>     sss_log(SSS_LOG_INFO, "Starting up");
> 
>-    DEBUG(3, ("CONFDB: %s\n", conf_db));
>+    DEBUG(SSSDBG_TRACE_FUNC, ("CONFDB: %s\n", conf_db));
> 
>     if (flags & FLAGS_INTERACTIVE) {
>         /* terminate when stdin goes away */
>diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c
>index 0031d24..2b9d8bf 100644
>--- a/src/util/sss_krb5.c
>+++ b/src/util/sss_krb5.c
>@@ -489,7 +489,7 @@ krb5_error_code find_principal_in_keytab(krb5_context ctx,
> 
>     if (!principal_found) {
>         kerr = KRB5_KT_NOTFOUND;
>-        DEBUG(SSSDBG_MINOR_FAILURE,
>+        DEBUG(SSSDBG_TRACE_FUNC,
>               ("No principal matching %s@%s found in keytab.\n",
>                pattern_primary, pattern_realm));
>         goto done;
>-- 
>1.7.10

Actions: View | Diff

Attachments on bug 811113: 577074 | 577155