Deleted
Added
nxt_runtime.c (1013:4ca8428d231b) | nxt_runtime.c (1182:325b315e48c4) |
---|---|
1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) Valentin V. Bartenev 5 * Copyright (C) NGINX, Inc. 6 */ 7 8#include <nxt_main.h> --- 678 unchanged lines hidden (view full) --- 687 rt->user_cred.user = NXT_USER; 688 rt->group = NXT_GROUP; 689 rt->pid = NXT_PID; 690 rt->log = NXT_LOG; 691 rt->modules = NXT_MODULES; 692 rt->state = NXT_STATE; 693 rt->control = NXT_CONTROL_SOCK; 694 | 1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) Valentin V. Bartenev 5 * Copyright (C) NGINX, Inc. 6 */ 7 8#include <nxt_main.h> --- 678 unchanged lines hidden (view full) --- 687 rt->user_cred.user = NXT_USER; 688 rt->group = NXT_GROUP; 689 rt->pid = NXT_PID; 690 rt->log = NXT_LOG; 691 rt->modules = NXT_MODULES; 692 rt->state = NXT_STATE; 693 rt->control = NXT_CONTROL_SOCK; 694 |
695 nxt_memzero(&rt->capabilities, sizeof(nxt_capabilities_t)); 696 |
|
695 if (nxt_runtime_conf_read_cmd(task, rt) != NXT_OK) { 696 return NXT_ERROR; 697 } 698 | 697 if (nxt_runtime_conf_read_cmd(task, rt) != NXT_OK) { 698 return NXT_ERROR; 699 } 700 |
699 if (nxt_user_cred_get(task, &rt->user_cred, rt->group) != NXT_OK) { | 701 if (nxt_capability_set(task, &rt->capabilities) != NXT_OK) { |
700 return NXT_ERROR; 701 } 702 | 702 return NXT_ERROR; 703 } 704 |
705 if (rt->capabilities.setid) { 706 if (nxt_user_cred_get(task, &rt->user_cred, rt->group) != NXT_OK) { 707 return NXT_ERROR; 708 } 709 710 } else { 711 nxt_log(task, NXT_LOG_WARN, "Unit is running unprivileged, then it " 712 "cannot use arbitrary user and group."); 713 } 714 |
|
703 /* An engine's parameters. */ 704 705 interface = nxt_service_get(rt->services, "engine", rt->engine); 706 if (interface == NULL) { 707 return NXT_ERROR; 708 } 709 710 rt->engine = interface->name; --- 882 unchanged lines hidden --- | 715 /* An engine's parameters. */ 716 717 interface = nxt_service_get(rt->services, "engine", rt->engine); 718 if (interface == NULL) { 719 return NXT_ERROR; 720 } 721 722 rt->engine = interface->name; --- 882 unchanged lines hidden --- |