Fixed artifacts from cherry-picking devel->master

CMakeLists.txt

@@ -30,6 +30,8 @@
 
 cmake_minimum_required(VERSION 2.8.6)
 
+set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
 if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
 	message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env")
 	set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
@@ -44,7 +46,6 @@ endif()
 message(STATUS "BOOST_IGNORE_SYSTEM_PATHS defaults to ${BOOST_IGNORE_SYSTEM_PATHS_DEFAULT}")
 option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost ins	tallation" $BOOST_IGNORE_SYSTEM_PATHS_DEFAULT)
 
-
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
 enable_testing()

src/simplewallet/simplewallet.cpp

@@ -921,7 +921,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
       // for now, move on only if one address found
       if (addresses_from_dns.size() == 1)
       {
-        if (get_account_address_from_str(de.addr, addresses_from_dns[0]))
+        if (get_account_address_from_str(de.addr, m_wallet->testnet(), addresses_from_dns[0]))
         {
           // if it was an address, prompt user for confirmation.
           // inform user of DNSSEC validation status as well.
@@ -959,7 +959,7 @@ bool simple_wallet::transfer(const std::vector<std::string> &args_)
       }
       else if (addresses_from_dns.size() > 1)
       {
-        tools::fail_msg_writer() << "Multiple Monero addresses found for given URL: " << url << ", this is not yet supported.";
+        fail_msg_writer() << "Multiple Monero addresses found for given URL: " << url << ", this is not yet supported.";
       }
       else
       {