From 4c2d1635786fd0ecbfb601f4836ea1de4d65cc53 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Aug 04 2015 15:01:26 +0000
Subject: Fix "getcert start-tracking"'s -L and -l options


When "getcert start-tracking" was passing changes in enrollment options
to the "modify" API, it was forgetting to pass in new challenge password
and challenge password file names.  Add them (#1249753).

---

diff --git a/src/getcert.c b/src/getcert.c
index 216907c..79f09f5 100644
--- a/src/getcert.c
+++ b/src/getcert.c
@@ -1929,6 +1929,20 @@ set_tracking(const char *argv0, const char *category,
 			} else {
 				capath = NULL;
 			}
+			if (cpass != NULL) {
+				param[i].key = CM_DBUS_PROP_TEMPLATE_CHALLENGE_PASSWORD;
+				param[i].value_type = cm_tdbusm_dict_s;
+				param[i].value.s = cpass;
+				params[i] = &param[i];
+				i++;
+			}
+			if (cpassfile != NULL) {
+				param[i].key = CM_DBUS_PROP_TEMPLATE_CHALLENGE_PASSWORD_FILE;
+				param[i].value_type = cm_tdbusm_dict_s;
+				param[i].value.s = cpassfile;
+				params[i] = &param[i];
+				i++;
+			}
 			if (profile != NULL) {
 				param[i].key = CM_DBUS_PROP_TEMPLATE_PROFILE;
 				param[i].value_type = cm_tdbusm_dict_s;