From: Kaike Wan <kaike.wan@intel.com>
Date: Fri, 16 May 2014 03:48:41 +0000 (-0700)
Subject: ibacm/prov: Move support_ips_in_addr_cfg from prov to core
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1c200844fc2c5df1898b40fab987865967c93249;p=~shefty%2Fibacm.git

ibacm/prov: Move support_ips_in_addr_cfg from prov to core

This config option belongs to the core, not the provider.

Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
---

diff --git a/src/acm.c b/src/acm.c
index e1a4d92..33f53be 100644
--- a/src/acm.c
+++ b/src/acm.c
@@ -4731,6 +4731,8 @@ static void acm_set_options(void)
 			server_port = (short) atoi(value);
 		else if (!stricmp("provider_lib_path", opt))
 			strcpy(prov_lib_path, value);
+		else if (!stricmp("support_ips_in_addr_cfg", opt))
+			support_ips_in_addr_cfg = atoi(value);
 	}
 
 	fclose(f);
@@ -4786,8 +4788,6 @@ static void acmp_set_options(void)
 			addr_preload = acmp_convert_addr_preload(value);
 		else if (!stricmp("addr_data_file", opt))
 			strcpy(addr_data_file, value);
-		else if (!stricmp("support_ips_in_addr_cfg", opt))
-			support_ips_in_addr_cfg = atoi(value);
 	}
 
 	fclose(f);
@@ -4800,6 +4800,7 @@ static void acm_log_options(void)
 	acm_log(0, "lock file %s\n", lock_file);
 	acm_log(0, "server_port %d\n", server_port);
 	acm_log(0, "provider lib path %s\n", prov_lib_path);
+	acm_log(0, "support IP's in ibacm_addr.cfg %d\n", support_ips_in_addr_cfg);
 }
 
 static void acmp_log_options(void)
@@ -4821,7 +4822,6 @@ static void acmp_log_options(void)
 	acm_log(0, "route data file %s\n", route_data_file);
 	acm_log(0, "address preload %d\n", addr_preload);
 	acm_log(0, "address data file %s\n", addr_data_file);
-	acm_log(0, "support IP's in ibacm_addr.cfg %d\n", support_ips_in_addr_cfg);
 }
 
 static FILE *acm_open_log(void)