From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 30 May 2014 07:29:56 +0000 (+0200)
Subject: Fixed swid_generator interface
X-Git-Tag: 5.2.0dr5~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9635a9218716d0f1daceaee2db432ca395f3c1fb;p=thirdparty%2Fstrongswan.git

Fixed swid_generator interface
---

diff --git a/src/libpts/swid/swid_inventory.c b/src/libpts/swid/swid_inventory.c
index c1e2844828..4b1f7fb20f 100644
--- a/src/libpts/swid/swid_inventory.c
+++ b/src/libpts/swid/swid_inventory.c
@@ -162,10 +162,9 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
 		/* Assemble the SWID generator command */
 		if (this->full_tags)
 		{
-			snprintf(command, BUF_LEN, "%s swid --entity-name \"%s\" %s%s",
-					 generator, entity_name,
-					 pretty ? "--pretty" : "--doc-separator $'\n\n'",
-					 full   ? " --full" : "");
+			snprintf(command, BUF_LEN, "%s swid --entity-name \"%s\" "
+					 "--doc-separator $'\n\n'%s%s", generator, entity_name,
+					 pretty ? " --pretty" : "", full ? " --full" : "");
 		}
 		else
 		{
@@ -182,12 +181,12 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
 
 		if (this->full_tags)
 		{
-			DBG2(DBG_IMC, "SWID tags generated by package manager:");
+			DBG2(DBG_IMC, "SWID tag generation by package manager");
 			status = read_swid_tags(this, file);
 		}
 		else
 		{
-			DBG2(DBG_IMC, "SWID tag IDs generated by package manager:");
+			DBG2(DBG_IMC, "SWID tag ID generation by package manager");
 			status = read_swid_tag_ids(this, file);
 		}
 		pclose(file);