summaryrefslogtreecommitdiff
path: root/src/node_main.cc
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2018-12-16 03:13:12 +0800
committerJoyee Cheung <joyeec9h3@gmail.com>2018-12-19 02:44:03 +0800
commit321e296371383fd63131d21c1121e22163ddeb86 (patch)
tree71113f7b4f3300f706ee1a3f988bae117fc2c8c8 /src/node_main.cc
parent74a1dfb56e413373064475290a1fd6a9cf8cd9ae (diff)
downloadandroid-node-v8-321e296371383fd63131d21c1121e22163ddeb86.tar.gz
android-node-v8-321e296371383fd63131d21c1121e22163ddeb86.tar.bz2
android-node-v8-321e296371383fd63131d21c1121e22163ddeb86.zip
process: move POSIX credential accessors into node_credentials.cc
Expose the POSIX credential accessors through `internalBinding('credentials')` instead of setting them on the process or bootstrapper object from C++ directly. Also moves `SafeGetEnv` from `internalBinding('util')` to `internalBinding('credentials')` since it's closely related to the credentials. In the JS land, instead of wrapping the bindings then writing to the process object directly in main_thread_only.js, return the wrapped functions back to bootstrap/node.js where they get written to the process object conditionally for clarity. Refs: https://github.com/nodejs/node/issues/24961 PR-URL: https://github.com/nodejs/node/pull/25066 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/node_main.cc')
-rw-r--r--src/node_main.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/node_main.cc b/src/node_main.cc
index bea1af7bdd..7107aea8c1 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -88,7 +88,9 @@ extern char** environ;
#endif
namespace node {
- extern bool linux_at_secure;
+namespace per_process {
+extern bool linux_at_secure;
+} // namespace per_process
} // namespace node
int main(int argc, char* argv[]) {
@@ -112,7 +114,7 @@ int main(int argc, char* argv[]) {
Elf_auxv_t* auxv = reinterpret_cast<Elf_auxv_t*>(envp);
for (; auxv->a_type != AT_NULL; auxv++) {
if (auxv->a_type == AT_SECURE) {
- node::linux_at_secure = auxv->a_un.a_val;
+ node::per_process::linux_at_secure = auxv->a_un.a_val;
break;
}
}