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

14 files changed, 26 insertions, 26 deletions

diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
index 3f135213..e8f58716 100644
--- a/src/confdb/confdb.c
+++ b/src/confdb/confdb.c
@@ -808,7 +808,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 041f576e..1cc092f8 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -2078,7 +2078,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);
 
@@ -2447,7 +2447,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 7d704a31..37c61e96 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -2274,7 +2274,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 deb7d394..5ef1436d 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 ee35b522..d7586aa5 100644
--- a/src/providers/krb5/krb5_common.c
+++ b/src/providers/krb5/krb5_common.c
@@ -166,13 +166,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 3c39d847..fbea87db 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 22cd7d9a..b578ad74 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -1043,7 +1043,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 92c966b1..77b6bbe9 100644
--- a/src/providers/ldap/ldap_init.c
+++ b/src/providers/ldap/ldap_init.c
@@ -118,7 +118,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 e00079cd..70d1f072 100644
--- a/src/providers/simple/simple_access.c
+++ b/src/providers/simple/simple_access.c
@@ -349,8 +349,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 242fae99..e5577403 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -705,7 +705,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 62253804..617dfae4 100644
--- a/src/responder/nss/nsssrv.c
+++ b/src/responder/nss/nsssrv.c
@@ -360,7 +360,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 57fa0e4d..2255d196 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 27ef1c88..c6261917 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 c59c193b..f3f1b201 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -391,8 +391,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;
         }
     }
@@ -526,7 +526,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 */