refresh

diff --git a/meta b/meta
index 4321d6a50c343a680101112b9672e0291281b1ae..d1724fb1cdd254c4655d20d232ef48a4538d116e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6fc7bf9a16b2f8e3c002477a3c2433044dcc86ef
-Head: 1e13f618f2c3dd24545bac784d77a7d9bfcff80b
+Previous: c2398af7d45563aecdbb4bb4fd705df05861854c
+Head: ce87a2b0e66cea053603c29aa084aca863f7644e
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -16,8 +16,7 @@ Applied:
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
-  mult_dest: fb1f5aec3c600cf11fb049eb2065da76ef73ccda
-  refresh-temp: 1e13f618f2c3dd24545bac784d77a7d9bfcff80b
+  mult_dest: ce87a2b0e66cea053603c29aa084aca863f7644e
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/mult_dest b/patches/mult_dest
index 5e4a6c310b334e94b46b2cdc7e7a80a9dddc3b08..d1d4e8f20ce6fac95047f94f0455e787dbdcb393 100644 (file)
--- a/patches/mult_dest
+++ b/patches/mult_dest
@@ -1,5 +1,5 @@
 Bottom: 32a7b8b2ffc23b410dc19c50a9bf68e149662635
-Top:    16e9ccf5f15fb3b0f38df9b8f54df71a05372f49
+Top:    d3c7a806f212c9f20c9f09ed867e4cd02850eab7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 09:39:52 -0800
 
@@ -50,7 +50,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..19fef2c 100644
+index 7e1ca5e..6e82765 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -60,6 +60,7 @@ struct ibv_context **verbs;
@@ -101,7 +101,7 @@ index 7e1ca5e..19fef2c 100644
  
 -      if (!ret)
 -              show_path(&path);
-+      for (dest_addr = dest_list[i]; dest_addr; i++) {
++      for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
 +              switch (addr_type) {
 +              case 'i':
 +                      ret = resolve_ip(&path);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 74cb5da..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 16e9ccf5f15fb3b0f38df9b8f54df71a05372f49
-Top:    d3c7a806f212c9f20c9f09ed867e4cd02850eab7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 11:03:21 -0800
-
-Refresh of mult_dest
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 19fef2c..6e82765 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -531,7 +531,7 @@ static int resolve(char *program, char *dest_arg)
-               return -1;
-       }
- 
--      for (dest_addr = dest_list[i]; dest_addr; i++) {
-+      for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
-               switch (addr_type) {
-               case 'i':
-                       ret = resolve_ip(&path);