walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Extract several chown() usages into 1 function

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-22 18:32:40 +09:00
parent 230b1f927f
commit 03bb58006b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/shrpx.cc
View File

@ -182,6 +182,12 @@ int resolve_hostname(Address *addr, const char *hostname, uint16_t port,
} }
} // namespace } // namespace
namespace {
int chown_to_running_user(const char *path) {
return chown(path, get_config()->uid, get_config()->gid);
}
} // namespace
namespace { namespace {
void save_pid() { void save_pid() {
std::ofstream out(get_config()->pid_file.get(), std::ios::binary); std::ofstream out(get_config()->pid_file.get(), std::ios::binary);
@ -193,8 +199,7 @@ void save_pid() {
} }
if (get_config()->uid != 0) { if (get_config()->uid != 0) {
if (chown(get_config()->pid_file.get(), get_config()->uid, if (chown_to_running_user(get_config()->pid_file.get()) == -1) {
get_config()->gid) == -1) {
auto error = errno; auto error = errno;
LOG(WARN) << "Changing owner of pid file " << get_config()->pid_file.get() LOG(WARN) << "Changing owner of pid file " << get_config()->pid_file.get()
<< " failed: " << strerror(error); << " failed: " << strerror(error);
@ -2181,7 +2186,7 @@ int main(int argc, char **argv) {
mod_config()->http2_upstream_dump_request_header = f; mod_config()->http2_upstream_dump_request_header = f;
if (get_config()->uid != 0) { if (get_config()->uid != 0) {
if (chown(path, get_config()->uid, get_config()->gid) == -1) { if (chown_to_running_user(path) == -1) {
auto error = errno; auto error = errno;
LOG(WARN) << "Changing owner of http2 upstream request header file " LOG(WARN) << "Changing owner of http2 upstream request header file "
<< path << " failed: " << strerror(error); << path << " failed: " << strerror(error);
@ -2202,7 +2207,7 @@ int main(int argc, char **argv) {
mod_config()->http2_upstream_dump_response_header = f; mod_config()->http2_upstream_dump_response_header = f;
if (get_config()->uid != 0) { if (get_config()->uid != 0) {
if (chown(path, get_config()->uid, get_config()->gid) == -1) { if (chown_to_running_user(path) == -1) {
auto error = errno; auto error = errno;
LOG(WARN) << "Changing owner of http2 upstream response header file" LOG(WARN) << "Changing owner of http2 upstream response header file"
<< " " << path << " failed: " << strerror(error); << " " << path << " failed: " << strerror(error);