From dfbaa33afdc39d60b9d8c302dd1e16c436b32bfbe3aee3da6e181f95cd0cbc48 Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Sun, 20 Oct 2013 12:05:07 +0000
Subject: [PATCH] Accepting request 204015 from home:cboltz

- apparmor-profiles-samba4.diff, usr.sbin.winbindd: some more profile
  updates for samba 4.x (bnc#846054#c5)

Please also include this change in 13.1

OBS-URL: https://build.opensuse.org/request/show/204015
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=56
---
 apparmor-profiles-samba4.diff | 5 +++--
 apparmor.changes              | 6 ++++++
 usr.sbin.winbindd             | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apparmor-profiles-samba4.diff b/apparmor-profiles-samba4.diff
index dfebe4b..2397287 100644
--- a/apparmor-profiles-samba4.diff
+++ b/apparmor-profiles-samba4.diff
@@ -12,10 +12,11 @@
 
 === modified file 'profiles/apparmor.d/usr.sbin.nmbd'
 --- profiles/apparmor.d/usr.sbin.nmbd	2011-08-27 18:50:42 +0000
-+++ profiles/apparmor.d/usr.sbin.nmbd	2013-10-15 20:36:33 +0000
-@@ -12,6 +12,7 @@
++++ profiles/apparmor.d/usr.sbin.nmbd	2013-10-20 11:54:48 +0000
+@@ -11,7 +11,9 @@
    /usr/sbin/nmbd mr,
  
++  /var/cache/samba/gencache.tdb rwk,
    /var/{cache,lib}/samba/browse.dat* rw,
 +  /var/{cache,lib}/samba/gencache.dat rw,
    /var/{cache,lib}/samba/wins.dat* rw,
diff --git a/apparmor.changes b/apparmor.changes
index 052f9f7..1681f24 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct 20 11:59:28 UTC 2013 - opensuse@cboltz.de
+
+- apparmor-profiles-samba4.diff, usr.sbin.winbindd: some more profile
+  updates for samba 4.x (bnc#846054#c5)
+
 -------------------------------------------------------------------
 Tue Oct 15 20:10:49 UTC 2013 - opensuse@cboltz.de
 
diff --git a/usr.sbin.winbindd b/usr.sbin.winbindd
index 95ad889..99f4613 100644
--- a/usr.sbin.winbindd
+++ b/usr.sbin.winbindd
@@ -11,8 +11,10 @@
   /tmp/.winbindd/ w,
   /usr/lib*/samba/idmap/*.so mr,
   /usr/lib*/samba/nss_info/*.so mr,
+  /usr/lib*/samba/pdb/*.so mr,
   /usr/sbin/winbindd mr,
   /usr/share/samba/codepages/{lowcase,upcase,valid}.dat r,
+  /var/cache/samba/*.tdb rwk,
   /var/cache/samba/netsamlogon_cache.tdb rw,
   /var/lib/samba/account_policy.tdb rwk,
   /var/lib/samba/gencache.tdb rwk,
@@ -28,8 +30,10 @@
   /var/log/samba/cores/winbindd/** rw,
   /var/log/samba/log.wb-* w,
   /var/log/samba/log.winbindd rw,
+  /var/log/samba/log.winbindd-idmap w,
   /{var/,}run/samba/winbindd.pid rwk,
   /{var/,}run/samba/winbindd/ rw,
+  /{var/,}run/samba/winbindd/pipe w,
 
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.winbindd>