refresh

diff --git a/meta b/meta
index 8ef528b8b40aa343a200036dddc897c6f6467385..a3bce1288aadacf73c580ff9fd8e9916c447976a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 800e22db9f6acb2d1d43dd9dc28b2f96ffa2de85
-Head: ce99cde29366fcdc64fb95c7f64686feffa12c37
+Previous: 575514c26f4cf38d7756ac961aca0f3be01235fd
+Head: 2338c27f2fa869a401b1f49a03df124121815bb7
 Applied:
-  loopback: b1248861b1347df035978c3a7fa05bd9852eeec0
-  refresh-temp: ce99cde29366fcdc64fb95c7f64686feffa12c37
+  loopback: 2338c27f2fa869a401b1f49a03df124121815bb7
 Unapplied:
 Hidden:

diff --git a/patches/loopback b/patches/loopback
index 2e9e23eb8b2e168a8921c8179f01ef622b4c49d9..4bf96c9f345dc89fe511eeaa8507dd7cf95c31ee 100644 (file)
--- a/patches/loopback
+++ b/patches/loopback
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    d2e644c42312b47d5484b378d8e9c5a522d537bd
+Top:    d0ab813676bf3b2afdc08333cc7016d705cc9841
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-09 15:37:58 -0800
 
@@ -34,7 +34,7 @@ index 3dbb0c6..61872ef 100644
  # TCP port number that the server listens on.\r
  # If this value is changed, then a corresponding change is required for\r
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..faa915e 100644
+index 820365c..d4ea711 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -200,6 +200,7 @@ static char log_file[128] = "stdout";
@@ -83,7 +83,7 @@ index 820365c..faa915e 100644
        if (!ep) {
 -              acm_log(0, "unknown local end point\n");
 +              acm_log_addr(0, "acm_svr_resolve: could not find ",
-+                           data->type, data->info.addr);
++                           saddr->type, saddr->info.addr);
                return acm_client_resolve_resp(client, msg, NULL, ACM_STATUS_ESRCADDR);
        }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4844038..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: d2e644c42312b47d5484b378d8e9c5a522d537bd
-Top:    d0ab813676bf3b2afdc08333cc7016d705cc9841
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-10 09:31:38 -0800
-
-Refresh of loopback
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index faa915e..d4ea711 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1963,7 +1963,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg)
-       ep = acm_get_ep(saddr);
-       if (!ep) {
-               acm_log_addr(0, "acm_svr_resolve: could not find ",
--                           data->type, data->info.addr);
-+                           saddr->type, saddr->info.addr);
-               return acm_client_resolve_resp(client, msg, NULL, ACM_STATUS_ESRCADDR);
-       }