am 9287d2d8: am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."
* commit '9287d2d83a420d750e3c1490d52930c11f662a19':
Fix adbd/adb server confusion in an error message.
diff --git a/adb/transport.cpp b/adb/transport.cpp
index 274449b..1bb130f 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -789,9 +789,10 @@
if (result->connection_state == kCsUnauthorized) {
*error_out = "device unauthorized.\n";
char* ADB_VENDOR_KEYS = getenv("ADB_VENDOR_KEYS");
- *error_out += "This adbd's $ADB_VENDOR_KEYS is ";
+ *error_out += "This adb server's $ADB_VENDOR_KEYS is ";
*error_out += ADB_VENDOR_KEYS ? ADB_VENDOR_KEYS : "not set";
- *error_out += "; try 'adb kill-server' if that seems wrong.\n";
+ *error_out += "\n";
+ *error_out += "Try 'adb kill-server' if that seems wrong.\n";
*error_out += "Otherwise check for a confirmation dialog on your device.";
result = NULL;
}