From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 17 Nov 2008 21:14:03 +0000 (+0000)
Subject: Log more info if ulog_replay fails.  Correctly use supplied keytab name
X-Git-Tag: krb5-1.7-alpha1~204
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=42fd2d7f8bb03054d3334cc8cad775188804f9f2;p=krb5.git

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 123b2fe66..81c490383 100644
--- 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)