ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"

Browse Source 
* commit 'c4193f1fef52314b451f55cce48ce44f94b875b6':
  Migrate keychain directories to /data/misc/user/0
This commit is contained in:
Robin Lee 2014-06-09 12:51:06 +00:00 committed by Android Git Automerger
commit 04eb4227b0
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmds/installd/installd.c
View File

@ -489,6 +489,11 @@ int initialize_directories() {
goto fail; goto fail;
} }
if (ensure_config_user_dirs(0) == -1) {
ALOGE("Failed to setup misc for user 0");
goto fail;
}
if (version == 2) { if (version == 2) {
ALOGD("Upgrading to /data/misc/user directories"); ALOGD("Upgrading to /data/misc/user directories");
@ -517,12 +522,31 @@ int initialize_directories() {
closedir(dir); closedir(dir);
} }
version = 3; // Just rename keychain files into user/0; they should already have the right permissions
} char misc_dir[PATH_MAX];
char keychain_added_dir[PATH_MAX];
char keychain_removed_dir[PATH_MAX];
char config_added_dir[PATH_MAX];
char config_removed_dir[PATH_MAX];
if (ensure_config_user_dirs(0) == -1) { snprintf(misc_dir, PATH_MAX, "%s/misc", android_data_dir.path);
ALOGE("Failed to setup misc for user 0"); snprintf(keychain_added_dir, PATH_MAX, "%s/keychain/cacerts-added", misc_dir);
goto fail; snprintf(keychain_removed_dir, PATH_MAX, "%s/keychain/cacerts-removed", misc_dir);
snprintf(config_added_dir, PATH_MAX, "%s/user/0/cacerts-added", misc_dir);
snprintf(config_removed_dir, PATH_MAX, "%s/user/0/cacerts-removed", misc_dir);
if (access(keychain_added_dir, F_OK) == 0) {
if (rename(keychain_added_dir, config_added_dir) != 0) {
goto fail;
}
}
if (access(keychain_removed_dir, F_OK) == 0) {
if (rename(keychain_removed_dir, config_removed_dir) != 0) {
goto fail;
}
}
version = 3;
} }
// Persist layout version if changed // Persist layout version if changed