commit

diff --git a/meta b/meta
index 19abacf3600fc0d9c51b7ee567c0bdfa3cdbbefa..8030eb31bb2f2ad1daf0ec6872734f3116effe5f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 643e9c51ae270c1821e71ab9c0fd637020353620
+Previous: b0f074f858fcbee2113563e2e3fe80cb7f011df8
 Head: 5010e6031fc0fc0e26e008e6972ef83c9242d8ce
 Applied:
-  ibacm-define-prov_lib_path-as-: 5010e6031fc0fc0e26e008e6972ef83c9242d8ce
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ibacm-define-prov_lib_path-as- b/patches/ibacm-define-prov_lib_path-as-
deleted file mode 100644 (file)
index a8890ce..0000000
--- a/patches/ibacm-define-prov_lib_path-as-
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 35fd60e5ad8d8c58e2774173414af34ecd73c204
-Top:    0c45574395afa9ff24d6468cfce3f34b57af4525
-Author: Kaike Wan <kaike.wan@intel.com>
-Date:   2014-07-07 10:36:25 -0700
-
-ibacm: define prov_lib_path as a char array
-
-This patch fixes a segfault error when the option file defines the provider
-lib path. The variable prov_lib_path should be a buffer (char array) instead
-of a char pointer. This allows a string to be copied into it during option
-parsing.
-
-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 8f147ef..fae9d0b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -193,7 +193,7 @@ static int log_level = 0;
- static char lock_file[128] = "/var/run/ibacm.pid";
- static short server_port = 6125;
- static int support_ips_in_addr_cfg = 0;
--static char *prov_lib_path = IBACM_LIB_PATH;
-+static char prov_lib_path[256] = IBACM_LIB_PATH;
- 
- void acm_write(int level, const char *format, ...)
- {