userspace/snmpd: don't print dot-config_source_url not found when try_dhcp

Such error was printed to the syslog Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/snmpd: don't print dot-config_source_url not found when try_dhcp
Such error was printed to the syslog Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
0af4f128 · Adam Wujek · 5116833f · 0af4f128
Commit 0af4f128 authored Nov 02, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

wrsBootStatusGroup.c userspace/snmpd/wrsBootStatusGroup.c +4 -5

No files found.
--- a/userspace/snmpd/wrsBootStatusGroup.c
+++ b/userspace/snmpd/wrsBootStatusGroup.c
@@ -233,6 +233,8 @@ static void get_dotconfig_source(void)
 			 "open " DOTCONFIGDIR "/" DOTCONFIG_SOURCE "\n");
 	}

+	memset(wrsBootStatus_s.wrsConfigSourceUrl, 0,
+	       sizeof(wrsBootStatus_s.wrsConfigSourceUrl));
 	/* read dot-config's URL only when config source is not local */
 	if (wrsBootStatus_s.wrsConfigSource != WRS_CONFIG_SOURCE_LOCAL) {
 		/* read URL used to get dotconfig */
@@ -242,17 +244,14 @@ static void get_dotconfig_source(void)
 			fscanf(f, LINE_READ_LEN(WRS_CONFIG_SOURCE_URL_LEN),
 			      wrsBootStatus_s.wrsConfigSourceUrl);
 			fclose(f);
-		} else {
+		} else if (wrsBootStatus_s.wrsConfigSource != WRS_CONFIG_SOURCE_TRY_DHCP) {
 			/* host file not found, put "error" into
-			 * wrsConfigSourceHost */
+			 * wrsConfigSourceUrl for all except try_dhcp */
 			strcpy(wrsBootStatus_s.wrsConfigSourceUrl, "error");
 			snmp_log(LOG_ERR, "SNMP: " SL_ER " wrsConfigSourceUrl:"
 				 " failed to open "
 				 DOTCONFIGDIR "/" DOTCONFIG_SOURCE_URL"\n");
 		}
-	} else {
-		memset(wrsBootStatus_s.wrsConfigSourceUrl, 0,
-		       sizeof(wrsBootStatus_s.wrsConfigSourceUrl));
 	}

 	f = fopen(DOTCONFIGDIR "/" DOTCONFIG_STATUS, "r");