From: Zbigniew Jędrzejewski-Szmek Date: Thu, 21 Mar 2019 14:14:11 +0000 (+0100) Subject: Merge pull request #12059 from poettering/nspawn-typos X-Git-Tag: v242-rc1~97 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa28e4e37778a825fca19a912ae478994c217e5c;p=thirdparty%2Fsystemd.git Merge pull request #12059 from poettering/nspawn-typos some typo and other fixes result of the OCI nspawn merge --- fa28e4e37778a825fca19a912ae478994c217e5c diff --cc src/basic/capability-util.c index 99628f62608,03a6b660fb1..0035352954a --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@@ -515,10 -519,12 +516,10 @@@ int capability_quintet_enforce(const Ca /* Now, let's enforce the caps for the first time. Note that this is where we acquire * caps in any of the sets we currently don't have. We have to do this before - * droppoing the bounding caps below, since at that point we can never acquire new - * caps in inherited/permitted/effective anymore, but only lose them.*/ + * dropping the bounding caps below, since at that point we can never acquire new + * caps in inherited/permitted/effective anymore, but only lose them. */ if (cap_set_proc(modified ?: c) < 0) return -errno; - - need_set_proc_again = !!modified; } }