Log more info if ulog_replay fails. Correctly use supplied keytab name

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21131 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 123b2fe6614822ac14071ff4cdf421611e812198..81c490383b20155b763aa38e7443f32f91792514 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -512,7 +512,6 @@ krb5_error_code do_iprop(kdb_log_context *log_ctx)
        void *server_handle = NULL;
        char *iprop_svc_princstr = NULL;
        char *master_svc_princstr = NULL;
-       char *keytab_name = NULL;
        unsigned int pollin, backoff_time;
        int backoff_cnt = 0;
        int reinit_cnt = 0;
@@ -609,7 +608,7 @@ reinit:
        /*
         * Authentication, initialize rpcsec_gss handle etc.
         */
-       retval = kadm5_init_with_skey(iprop_svc_princstr, keytab_name,
+       retval = kadm5_init_with_skey(iprop_svc_princstr, srvtab,
                                      master_svc_princstr,
                                      &params,
                                      KADM5_STRUCT_VERSION,
@@ -783,9 +782,12 @@ reinit:
                                             db_args);
 
                        if (retval) {
-                               syslog(LOG_ERR, _("kpropd: ulog_replay"
-                                       " failed, updates not registered."));
-                               break;
+                           char *msg = krb5_get_error_message(kpropd_context,
+                                                              retval);
+                           syslog(LOG_ERR,
+                                  _("kpropd: ulog_replay failed (%s), updates not registered."), msg);
+                           krb5_free_error_message(kpropd_context, msg);
+                           break;
                        }
 
                        if (debug)