From: Filipe Brandenburger <filbranden@google.com>
Date: Tue, 23 Dec 2014 18:38:42 +0000 (-0800)
Subject: nspawn: remove spurious include of <sys/capability.h>
X-Git-Tag: v219~832
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f01ae8260d90ccff2f299242cd370ab58ea723f0;ds=sidebyside

nspawn: remove spurious include of <sys/capability.h>

It does not use any functions from libcap directly. The CAP_* constants in use
through this file come from "missing.h" which will import <linux/capability.h>
and complement it with CAP_* constants not defined by the current kernel
headers.

Add an explicit import of our "capability.h" since it does use the function
capability_bounding_set_drop from that header file. Previously, that header was
implicitly imported through through "cap-list.h".

Tested that "systemd-nspawn" builds cleanly and works after this change.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 0dd12adf0..04396ebed 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/prctl.h>
-#include <sys/capability.h>
 #include <getopt.h>
 #include <termios.h>
 #include <sys/signalfd.h>
@@ -90,6 +89,7 @@
 #include "base-filesystem.h"
 #include "barrier.h"
 #include "event-util.h"
+#include "capability.h"
 #include "cap-list.h"
 #include "btrfs-util.h"