Merge lp:~intrigeri/apparmor/nameservice-NetworkManager into lp:apparmor/2.12

[intrigeri]

[Jamie Strandboge (jdstrand)]

LGTM. Thanks!

review: Approve

[Seth Arnold (seth-arnold)]

Two alternations in one rule with mutli-path segments in both of them makes this quite difficult for me to read. It grants access to six files and it's not clear to me that all six are actually necessary somewhere.

There's more text in the comments explaining it than is actually needed to refer to the files individually. :)

If this is already merged, than it's probably not worth any more time, but if this isn't yet merged, I'd like to see it split apart.

Thanks

[intrigeri (intrigeri)]

Seth Arnold wrote (10 Feb 2016 18:14:11 GMT) :
> Two alternations in one rule with mutli-path segments in both of them makes this
> quite difficult for me to read. It grants access to six files and it's not clear to
> me that all six are actually necessary somewhere.

> There's more text in the comments explaining it than is actually needed to refer to the files individually. :)

I'll keep this in mind. Thanks for reviewing :)

> If this is already merged, than it's probably not worth any more time, but if this isn't yet merged, I'd like to see it split apart.

Apparently it's merged already.

=== modified file 'profiles/apparmor.d/abstractions/nameservice'
--- profiles/apparmor.d/abstractions/nameservice	2016-01-05 23:03:06 +0000
+++ profiles/apparmor.d/abstractions/nameservice	2016-02-10 10:11:47 +0000
@@ -35,12 +35,12 @@
   /etc/resolv.conf        r,
   # on systems using resolvconf, /etc/resolv.conf is a symlink to
   # /{,var/}run/resolvconf/resolv.conf and a file sometimes referenced in
-  # /etc/resolvconf/run/resolv.conf
-  /{,var/}run/resolvconf/resolv.conf r,
+  # /etc/resolvconf/run/resolv.conf. Similarly, if NetworkManager is used
+  # without resolvconf, /etc/resolv.conf is a symlink to its own resolv.conf.
+  # Finally, on systems using systemd's networkd, /etc/resolv.conf is
+  # a symlink to /run/systemd/resolve/resolv.conf
+  /{,var/}run/{resolvconf,NetworkManager,systemd/resolve}/resolv.conf r,
   /etc/resolvconf/run/resolv.conf r,
-  # on systems using systemd's networkd, /etc/resolv.conf is a symlink to
-  # /run/systemd/resolve/resolv.conf
-  /{,var/}run/systemd/resolve/resolv.conf r,
 
   /etc/samba/lmhosts      r,
   /etc/services           r,