]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Wed, 8 Dec 2010 17:54:32 +0000 (09:54 -0800)
committerSean Hefty <sean.hefty@intel.com>
Wed, 8 Dec 2010 17:54:32 +0000 (09:54 -0800)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 51e931164cae419e8c045b8091d9ed3500ab327e..4f62dcf9a5d25da44a89162c1e9d5f7d625d1d3b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 1254274cea250259f846cd2c1f911dd02549fda5
-Head: 7744a2280e5e691d93c2f61c0f24e5d8270666cc
+Previous: a4c66e638a12cb43bf180895247846c3173ea422
+Head: 833bd4190a48092e4433ea2a389c8d4910b61404
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -18,6 +18,7 @@ Applied:
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
   addrinfo: 7744a2280e5e691d93c2f61c0f24e5d8270666cc
+  refresh-temp: 833bd4190a48092e4433ea2a389c8d4910b61404
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..881ad63
--- /dev/null
@@ -0,0 +1,48 @@
+Bottom: 0edd0ef0f737d3e2c9d2efa715be0562fe412a07
+Top:    f7dc2be4209894e2f33282c013570cad8f85550b
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-08 09:54:32 -0800
+
+Refresh of addrinfo
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index d982b0d..7632ffa 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -517,21 +517,20 @@ static char *get_dest(char *arg)
+ {
+       static char addr[64];
+       struct addrinfo hint, *res;
+-      char *ai;
++      const char *ai;
+       int ret;
+       if (!arg || addr_type != 'u') {
+               return arg;
+       }
+-      if ((inet_pton(AF_INET, arg, addr) > 0) ||
+-          (inet_pton(AF_INET6, arg, addr) > 0) {
++      if ((inet_pton(AF_INET, arg, addr) > 0) || (inet_pton(AF_INET6, arg, addr) > 0)) {
+               return arg;
+       }
+       memset(&hint, 0, sizeof hint);
+       hint.ai_protocol = IPPROTO_TCP;
+-      ret = getaddrinfo(arg, NULL, &hints, &res);
++      ret = getaddrinfo(arg, NULL, &hint, &res);
+       if (ret) {
+               return arg;
+       }
+@@ -565,7 +564,8 @@ static int resolve(char *program, char *dest_arg)
+               return -1;
+       }
+-      for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
++      for (dest_addr = get_dest(dest_list[i]); dest_addr;
++           dest_addr = get_dest(dest_list[++i])) {
+               printf("Destination: %s\n", dest_addr);
+               switch (addr_type) {
+               case 'i':