From 3f29d38f0fdbca1be0fef4449b6a842c258f9b7e Mon Sep 17 00:00:00 2001
From: Kees Cook <kees@debian.org>
Date: Wed, 25 Apr 2012 12:55:05 -0700
Subject: [PATCH] Merge from trunk rev 2035:

Updates the X abstraction to include gdm3 path.

Author: Intrigeri <intrigeri@debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660079

Signed-off-by: Kees Cook <kees@ubuntu.com>
Acked-By: Steve Beattie <sbeattie@ubuntu.com>
---
 profiles/apparmor.d/abstractions/X | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/apparmor.d/abstractions/X b/profiles/apparmor.d/abstractions/X
index 9ec41238a..e093371df 100644
--- a/profiles/apparmor.d/abstractions/X
+++ b/profiles/apparmor.d/abstractions/X
@@ -17,7 +17,7 @@
 
   # .Xauthority files required for X connections, per user
   @{HOME}/.Xauthority           r,
-  owner /{,var/}run/gdm/*/database r,
+  owner /{,var/}run/gdm{,3}/*/database r,
   owner /{,var/}run/lightdm/authority/[0-9]* r,
 
   # the unix socket to use to connect to the display