Clean up log messages about keytab_name

There were many places where we were printing (null) to the logs
because a NULL keytab name tells libkrb5 to use its configured
default instead of a particular path. This patch should clean up
all uses of this to print "default" in the logs.

https://fedorahosted.org/sssd/ticket/1288

2 files changed, 16 insertions, 9 deletions

diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 6aeb7623f..209643a09 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -1273,8 +1273,10 @@ static krb5_error_code check_fast_ccache(krb5_context ctx, const char *primary,
         kerr = krb5_kt_default(ctx, &keytab);
     }
     if (kerr) {
-        DEBUG(0, ("Failed to read keytab file [%s].\n",
-                  keytab_name != NULL ? keytab_name : "(default)"));
+        DEBUG(SSSDBG_FATAL_FAILURE,
+              ("Failed to read keytab file [%s]: %s\n",
+               KEYTAB_CLEAN_NAME,
+               sss_krb5_get_error_message(ctx, kerr)));
         goto done;
     }
 
diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c
index 025236e5e..e66406c0e 100644
--- a/src/providers/ldap/ldap_child.c
+++ b/src/providers/ldap/ldap_child.c
@@ -228,8 +228,10 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx,
         krberr = krb5_kt_default(context, &keytab);
     }
     if (krberr) {
-        DEBUG(0, ("Failed to read keytab file: %s\n",
-                  sss_krb5_get_error_message(context, krberr)));
+        DEBUG(SSSDBG_FATAL_FAILURE,
+              ("Failed to read keytab file [%s]: %s\n",
+               KEYTAB_CLEAN_NAME,
+               sss_krb5_get_error_message(context, krberr)));
         goto done;
     }
 
@@ -272,11 +274,14 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx,
                                         keytab, 0, NULL, &options);
 
     if (krberr) {
-        DEBUG(0, ("Failed to init credentials: %s\n",
-                  sss_krb5_get_error_message(context, krberr)));
-        sss_log(SSS_LOG_ERR, "Failed to initialize credentials using keytab [%s]: %s. "
-                             "Unable to create GSSAPI-encrypted LDAP connection.",
-                             keytab_name, sss_krb5_get_error_message(context, krberr));
+        DEBUG(SSSDBG_FATAL_FAILURE,
+              ("Failed to init credentials: %s\n",
+               sss_krb5_get_error_message(context, krberr)));
+        sss_log(SSS_LOG_ERR,
+                "Failed to initialize credentials using keytab [%s]: %s. "
+                "Unable to create GSSAPI-encrypted LDAP connection.",
+                KEYTAB_CLEAN_NAME,
+                sss_krb5_get_error_message(context, krberr));
         goto done;
     }