pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adb: don't require adb keys to be named "*.adb_key". 

Don't require the extension on explicit file paths passed on; only
check for it in monitored directories.

Bug: http://b/33638233
Test: ADB_TRACE=1 ADB_VENDOR_KEYS=$HOME/foo adb server nodaemon
Change-Id: I7387e0bbe0f2e16878bf22b05d5c6e8d0f9e5a92
This commit is contained in:
Josh Gao 2016-12-14 16:59:29 -08:00
parent e69e9be7b6
commit a27666b823
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
adb/adb_auth_host.cpp
View File

@ -207,11 +207,6 @@ static bool read_keys(const std::string& path, bool allow_dir = true) {
}
if (S_ISREG(st.st_mode)) {
if (!android::base::EndsWith(path, ".adb_key")) {
LOG(INFO) << "skipping non-adb_key '" << path << "'";
return false;
}
return read_key_file(path);
} else if (S_ISDIR(st.st_mode)) {
if (!allow_dir) {
@ -236,7 +231,12 @@ static bool read_keys(const std::string& path, bool allow_dir = true) {
continue;
}
result |= read_keys((path + OS_PATH_SEPARATOR + name).c_str(), false);
if (!android::base::EndsWith(name, ".adb_key")) {
LOG(INFO) << "skipping non-adb_key '" << path << "/" << name << "'";
continue;
}
result |= read_key_file((path + OS_PATH_SEPARATOR + name));
}
return result;
}