refresh

diff --git a/meta b/meta
index 58c4794aaaec8cfab611fa31b80c774650f392da..f6c7908f4193abff39db69d11621dd8f56e903a8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 807b544813b4fe15dd3409fc370003bdaf06a71f
-Head: 1f4e63e9197cfdb970f42afa5832a49472a3c325
+Previous: 04cbae4496620c09dcbe7b8b73a2e47dd2188e51
+Head: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Applied:
-  loopback: 2338c27f2fa869a401b1f49a03df124121815bb7
-  refresh-temp: 1f4e63e9197cfdb970f42afa5832a49472a3c325
+  loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Unapplied:
 Hidden:

diff --git a/patches/loopback b/patches/loopback
index 4bf96c9f345dc89fe511eeaa8507dd7cf95c31ee..6ab602ba8d2a7e0e9390b1600f3c4d132590aaf5 100644 (file)
--- a/patches/loopback
+++ b/patches/loopback
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    d0ab813676bf3b2afdc08333cc7016d705cc9841
+Top:    8e12fd9af041eada9d787d668ec7a927950bc540
 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..d4ea711 100644
+index 820365c..ddd5cf0 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -200,6 +200,7 @@ static char log_file[128] = "stdout";
@@ -72,7 +72,7 @@ index 820365c..d4ea711 100644
 +                           daddr->type, daddr->info.addr);
 +              ep = acm_get_ep(daddr);
 +              if (ep) {
-+                      acm_log(2, "dest is local, and loopback is disabled");
++                      acm_log(2, "dest is local, and loopback is disabled\n");
 +                      return acm_client_resolve_resp(client, msg, NULL,
 +                                                     ACM_STATUS_EDESTADDR);
 +              }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index eb124bb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: d0ab813676bf3b2afdc08333cc7016d705cc9841
-Top:    8e12fd9af041eada9d787d668ec7a927950bc540
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-10 09:38:21 -0800
-
-Refresh of loopback
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index d4ea711..ddd5cf0 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1953,7 +1953,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg)
-                            daddr->type, daddr->info.addr);
-               ep = acm_get_ep(daddr);
-               if (ep) {
--                      acm_log(2, "dest is local, and loopback is disabled");
-+                      acm_log(2, "dest is local, and loopback is disabled\n");
-                       return acm_client_resolve_resp(client, msg, NULL,
-                                                      ACM_STATUS_EDESTADDR);
-               }