[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.13-1-8-g2a5d5b7

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 2a5d5b78d9e375696f2b55c577fcaa589f564327
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Aug 30 09:16:39 2012 +0200

    New patch Revert-security-Add-DAC-to-security_drivers.patch
    
    Revert "security: Add DAC to security_drivers"
    Thanks: Peter Krempa and Marcelo Cerri for tracking this down

diff --git a/debian/patches/Revert-security-Add-DAC-to-security_drivers.patch b/debian/patches/Revert-security-Add-DAC-to-security_drivers.patch
new file mode 100644
index 0000000..1501137
--- /dev/null
+++ b/debian/patches/Revert-security-Add-DAC-to-security_drivers.patch
@@ -0,0 +1,32 @@
+From: Peter Krempa <pkrempa at redhat.com>
+Date: Wed, 29 Aug 2012 14:29:43 +0200
+Subject: Revert "security: Add DAC to security_drivers"
+
+This reverts commit 9f9b7b85c9b422e8f4e813f3920bf8f433246a4a.
+
+The DAC security driver needs special handling and extra parameters and
+can't just be added to regular security drivers.
+---
+ src/security/security_driver.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/security/security_driver.c b/src/security/security_driver.c
+index e6da220..f450a94 100644
+--- a/src/security/security_driver.c
++++ b/src/security/security_driver.c
+@@ -35,7 +35,6 @@
+ # include "security_apparmor.h"
+ #endif
+ 
+-#include "security_dac.h"
+ #include "security_nop.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+@@ -47,7 +46,6 @@ static virSecurityDriverPtr security_drivers[] = {
+ #ifdef WITH_SECDRIVER_APPARMOR
+     &virAppArmorSecurityDriver,
+ #endif
+-    &virSecurityDriverDAC,
+     &virSecurityDriverNop, /* Must always be last, since it will always probe */
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 22a535b..dd101f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
+Revert-security-Add-DAC-to-security_drivers.patch

-- 
Libvirt Debian packaging