From db607f0e55804abcb966179cfb3fd64ab281348b Mon Sep 17 00:00:00 2001
From: Reyk Floeter <reyk@esdenera.com>
Date: Thu, 29 Jun 2017 13:34:19 +0200
Subject: [PATCH] Fix validation of the previous cloud-instance

---
 agent/main.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/agent/main.c b/agent/main.c
index e235e4e..7a6f2e9 100644
--- a/agent/main.c
+++ b/agent/main.c
@@ -419,10 +419,12 @@ agent_configure(struct system_config *sc, int noaction)
 	char			*str1, *str2;
 
 	/* Skip configuration on the same instance */
-	if ((str1 = filein("r", "/var/db/cloud-instance")) != NULL &&
-	    strcmp(sc->sc_instance, str1) == 0) {
-		free(str1);
-		return (0);
+	if ((str1 = filein("r", "/var/db/cloud-instance")) != NULL) {
+		str1[strcspn(str1, "\r\n")] = '\0';
+		if (strcmp(sc->sc_instance, str1) == 0) {
+			free(str1);
+			return (0);
+		}
 	}
 	free(str1);