[systemd-commits] src/nspawn

Colin Walters walters at kemper.freedesktop.org
Thu May 9 16:50:21 PDT 2013


 src/nspawn/nspawn.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2e996f4d4b642c5682c608c9692ad2ffae398ab2
Author: Colin Walters <walters at verbum.org>
Date:   Thu May 9 19:31:20 2013 -0400

    nspawn: Include netlink headers rather than using #ifdef
    
    This is a better fix than e13e1fad8b231e187bd5de3ce668411bdcd3ac1a for
    failing to compile without audit that
    77b6e19458f37cfde127ec6aa9494c0ac45ad890 introduced.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 33153c9..95d76eb 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -39,6 +39,7 @@
 #include <sys/signalfd.h>
 #include <grp.h>
 #include <linux/fs.h>
+#include <linux/netlink.h>
 #include <sys/un.h>
 #include <sys/socket.h>
 
@@ -1220,7 +1221,6 @@ finish:
 }
 
 static bool audit_enabled(void) {
-#ifdef HAVE_AUDIT
         int fd;
 
         fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_AUDIT);
@@ -1228,7 +1228,6 @@ static bool audit_enabled(void) {
                 close_nointr_nofail(fd);
                 return true;
         }
-#endif
         return false;
 }
 



More information about the systemd-commits mailing list