refresh

diff --git a/meta b/meta
index 1900342907444157aa00435e8409e99583de69ec..c3993c865fe75d34f131d614a5849e3467d9b3f3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: faa9db2e1a9050cb4201eef67a365e023f64b810
-Head: b1f1658066bfeb7115d7a90975486d287f0d73f2
+Previous: 485933fa5a205bfc6b8560e3ef5b0ac7556a7020
+Head: fb7bd236988a3506e7d98fd415d50d216a9e32f4
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -16,8 +16,7 @@ Applied:
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
-  mult_dest: 13a8d72b3561752c93542665692f2a1c22c564b5
-  refresh-temp: b1f1658066bfeb7115d7a90975486d287f0d73f2
+  mult_dest: fb7bd236988a3506e7d98fd415d50d216a9e32f4
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/mult_dest b/patches/mult_dest
index 973fc0d4ebfe9f5e655ec22a487e0f5a1652d966..eb05094543f3daf0c94fec5ac6dd4fc45bf465d4 100644 (file)
--- a/patches/mult_dest
+++ b/patches/mult_dest
@@ -1,5 +1,5 @@
 Bottom: 32a7b8b2ffc23b410dc19c50a9bf68e149662635
-Top:    8badc8cdc48b346f15c359b9df5fabc6da645bbd
+Top:    0218356f965d42baf54706b73dc0b362b11d4d6f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 09:39:52 -0800
 
@@ -37,7 +37,7 @@ index 56c49f0..de212fb 100644
  \-v\r
  Indicates that the resolved path information should be verified with the\r
 diff --git a/src/acme.c b/src/acme.c
-index 7e1ca5e..5ef05d3 100644
+index 7e1ca5e..19fef2c 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -60,6 +60,7 @@ struct ibv_context **verbs;
@@ -55,10 +55,10 @@ index 7e1ca5e..5ef05d3 100644
 -static int resolve(char *program)
 +static int resolve(char *program, char *dest_arg)
  {
-+      char *dest_list;
++      char **dest_list;
        struct ibv_path_record path;
 -      int ret;
-+      int ret, i;
++      int ret, i = 0;
  
        ret = libacm_init();
        if (ret) {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 90fefe7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 8badc8cdc48b346f15c359b9df5fabc6da645bbd
-Top:    0218356f965d42baf54706b73dc0b362b11d4d6f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 10:52:46 -0800
-
-Refresh of mult_dest
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 5ef05d3..19fef2c 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -515,9 +515,9 @@ static int verify_resolve(struct ibv_path_record *path)
- 
- static int resolve(char *program, char *dest_arg)
- {
--      char *dest_list;
-+      char **dest_list;
-       struct ibv_path_record path;
--      int ret, i;
-+      int ret, i = 0;
- 
-       ret = libacm_init();
-       if (ret) {