From 8eb6cbf5ac1db1458e727eba8c86b142b936f8fa Mon Sep 17 00:00:00 2001
From: Chunho Lee <chunhole@amazon.com>
Date: Sat, 9 Apr 2022 10:51:13 -0700
Subject: [PATCH] minimal: ss: policy2c: update MQTT fields

---
 .../minimal-secure-streams.c                  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c b/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c
index a89d0c8d6..bb86d3d3d 100644
--- a/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c
+++ b/minimal-examples/secure-streams/minimal-secure-streams-policy2c/minimal-secure-streams.c
@@ -573,13 +573,24 @@ int main(int argc, const char **argv)
 			if (pol->u.mqtt.will_message)
 				printf("\t\t\t.will_message = \"%s\",\n",
 					pol->u.mqtt.will_message);
-
+			if (pol->u.mqtt.will_qos)
+				printf("\t\t\t.will_qos = %u,\n",
+					pol->u.mqtt.will_qos);
+			if (pol->u.mqtt.will_retain)
+				printf("\t\t\t.will_retain = %u,\n",
+					pol->u.mqtt.will_retain);
 			if (pol->u.mqtt.birth_topic)
 				printf("\t\t\t.birth_topic = \"%s\",\n",
 					pol->u.mqtt.birth_topic);
 			if (pol->u.mqtt.birth_message)
 				printf("\t\t\t.birth_message = \"%s\",\n",
 					pol->u.mqtt.birth_message);
+			if (pol->u.mqtt.birth_qos)
+				printf("\t\t\t.birth_qos = %u,\n",
+					pol->u.mqtt.birth_qos);
+			if (pol->u.mqtt.birth_retain)
+				printf("\t\t\t.birth_retain = %u,\n",
+					pol->u.mqtt.birth_retain);
 			if (pol->u.mqtt.keep_alive)
 				printf("\t\t\t.keep_alive = %u,\n",
 					pol->u.mqtt.keep_alive);
@@ -589,19 +600,12 @@ int main(int argc, const char **argv)
 			if (pol->u.mqtt.clean_start)
 				printf("\t\t\t.clean_start = %u,\n",
 					pol->u.mqtt.clean_start);
-			if (pol->u.mqtt.will_qos)
-				printf("\t\t\t.will_qos = %u,\n",
-					pol->u.mqtt.will_qos);
-			if (pol->u.mqtt.will_retain)
-				printf("\t\t\t.will_retain = %u,\n",
-					pol->u.mqtt.will_retain);
 			if (pol->u.mqtt.aws_iot)
 				printf("\t\t\t.aws_iot = %u,\n",
 					pol->u.mqtt.aws_iot);
 			if (pol->u.mqtt.retain)
 				printf("\t\t\t.retain = %u,\n",
 					pol->u.mqtt.retain);
-
 			printf("\t\t}\n\t},\n");
 
 			break;