From: Robbie Harwood <rharwood@redhat.com>
Date: Thu, 6 Oct 2016 18:40:14 +0000 (-0400)
Subject: Fix kadmind debug printf to show kprop port
X-Git-Tag: krb5-1.15-beta1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29dc209a135bae4e15d328348c2dab73e1f2afce;p=thirdparty%2Fkrb5.git

Fix kadmind debug printf to show kprop port

Previously, if kprop_port was set, the flags logged would not match the
actual invocation of kprop.

ticket: 8456
---

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 76d3fdad0f..bce668f422 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -391,12 +391,15 @@ ipropx_resync(uint32_t vers, struct svc_req *rqstp)
 	    _exit(1);
 	}
 
-	DPRINT("%s: exec `kprop -r %s -f %s %s' ...\n",
-	       whoami, handle->params.realm, dump_file, clhost);
 	if (kprop_port != NULL) {
+	    DPRINT("%s: exec `kprop -r %s -f %s -P %s %s' ...\n",
+		   whoami, handle->params.realm, dump_file, kprop_port,
+		   clhost);
 	    pret = execl(kprop, "kprop", "-r", handle->params.realm, "-f",
 			 dump_file, "-P", kprop_port, clhost, NULL);
 	} else {
+	    DPRINT("%s: exec `kprop -r %s -f %s %s' ...\n",
+		   whoami, handle->params.realm, dump_file, clhost);
 	    pret = execl(kprop, "kprop", "-r", handle->params.realm, "-f",
 			 dump_file, clhost, NULL);
 	}