summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-10-28 15:35:29 +0200
committerGitHub <noreply@github.com>2016-10-28 15:35:29 +0200
commit1740c5a807708e74a7270bfb23beac2039135859 (patch)
treec5f1bcbeafad8613c4ba68de3d0f8fd1f2467e12 /src/core
parent4f985bd80278972912b80df1390f84d7a89f8d51 (diff)
parent74388c2d11acd9b638e33e09c7a99a9bc2c6292b (diff)
Merge pull request #4458 from keszybz/man-nonewprivileges
Document NoNewPrivileges default value
Diffstat (limited to 'src/core')
-rw-r--r--src/core/load-fragment.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 118b39c1cf..cbc826809e 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2744,11 +2744,6 @@ int config_parse_syscall_filter(
return r;
}
- /* Turn on NNP, but only if it wasn't configured explicitly
- * before, and only if we are in user mode. */
- if (!c->no_new_privileges_set && MANAGER_IS_USER(u->manager))
- c->no_new_privileges = true;
-
return 0;
}
@@ -3837,7 +3832,7 @@ int config_parse_no_new_privileges(
return 0;
}
- c->no_new_privileges = !!k;
+ c->no_new_privileges = k;
c->no_new_privileges_set = true;
return 0;