#
#
# patch "cmd_netsync.cc"
#  from [4f14e3b82c2a13607715913ce910c398054dad02]
#    to [2b8548c58d2d9e9154ead567ce499731bc081703]
# 
# patch "simplestring_xform.cc"
#  from [8f1e7cbe643a74ebb552a046b85ee7036253421b]
#    to [6838a1cbfd71ce2af242668c7f7ac1022c862f24]
#
============================================================
--- cmd_netsync.cc	4f14e3b82c2a13607715913ce910c398054dad02
+++ cmd_netsync.cc	2b8548c58d2d9e9154ead567ce499731bc081703
@@ -69,11 +69,11 @@ find_key(utf8 const & addr,
   rsa_keypair_id key;
   uri u;
   utf8 host(addr);
-  if (parse_uri(addr(), u))
+
+  parse_uri(addr(), u);
+  if (!u.host.empty())
     host = utf8(u.host);
-  if (!app.lua.hook_get_netsync_key(host,
-                                    include, exclude,
-                                    key)
+  if (!app.lua.hook_get_netsync_key(host, include, exclude, key)
       || key() == "")
     {
       if (needed)
============================================================
--- simplestring_xform.cc	8f1e7cbe643a74ebb552a046b85ee7036253421b
+++ simplestring_xform.cc	6838a1cbfd71ce2af242668c7f7ac1022c862f24
@@ -191,7 +191,7 @@ trim_ws(string const & s)
 
 #ifdef BUILD_UNIT_TESTS
 #include "unit_tests.hh"
-#include <stdlib.h>
+#include "vocab.hh"
 
 UNIT_TEST(simplestring_xform, caseconv)
 {