diff options
| author | Andrei Belov <defan@nginx.com> | 2019-12-26 17:52:09 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-12-26 17:52:09 +0300 |
| commit | 35ff5ee1e82a03e57d625230173a84c829c13257 (patch) | |
| tree | c3dce5e8d50c8da9739f23b41a636931ad562e25 /src/nxt_runtime.c | |
| parent | 0ec222bbb202194327c2e76d48f0b2608b37c162 (diff) | |
| parent | 55f8e31ed70910ef07db31d7f3c53b12774180f9 (diff) | |
| download | unit-35ff5ee1e82a03e57d625230173a84c829c13257.tar.gz unit-35ff5ee1e82a03e57d625230173a84c829c13257.tar.bz2 | |
Merged with the default branch.1.14.0-1
Diffstat (limited to '')
| -rw-r--r-- | src/nxt_runtime.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c index 096aabc4..80b25c1b 100644 --- a/src/nxt_runtime.c +++ b/src/nxt_runtime.c @@ -705,7 +705,10 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt) } if (rt->capabilities.setid) { - if (nxt_user_cred_get(task, &rt->user_cred, rt->group) != NXT_OK) { + ret = nxt_credential_get(task, rt->mem_pool, &rt->user_cred, + rt->group); + + if (nxt_slow_path(ret != NXT_OK)) { return NXT_ERROR; } @@ -1323,7 +1326,7 @@ nxt_runtime_process_release(nxt_runtime_t *rt, nxt_process_t *process) nxt_thread_mutex_destroy(&process->cp_mutex); if (process->init != NULL) { - nxt_mp_free(rt->mem_pool, process->init); + nxt_mp_destroy(process->init->mem_pool); } nxt_mp_free(rt->mem_pool, process); |