udev-acl: properly handle CK change events for root user

mschmidt@redhat.com writes:
> since root is treated specially, it does not do anything!
> udev-acl may want to prevent removing ACLs from root, but
> it must not stop the ACLs being granted to the user of the
> new session.

https://bugzilla.redhat.com/show_bug.cgi?id=608712

diff --git a/extras/udev-acl/udev-acl.c b/extras/udev-acl/udev-acl.c
index ff04ec6bed8543d38c352b1c48e3a276b0802f07..f2b50051c1121fa4bf80932f0f1a3553d1533f05 100644 (file)
--- a/extras/udev-acl/udev-acl.c
+++ b/extras/udev-acl/udev-acl.c
@@ -224,14 +224,10 @@ static int consolekit_called(const char *ck_action, uid_t *uid, uid_t *uid2, con
                if (s == NULL)
                        return -1;
                u = strtoul(s, NULL, 10);
-               if (u == 0)
-                       return 0;
                s = getenv("CK_SEAT_SESSION_USER_UID");
                if (s == NULL)
                        return -1;
                u2 = strtoul(s, NULL, 10);
-               if (u2 == 0)
-                       return 0;
 
                s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
                s2 = getenv("CK_SEAT_SESSION_IS_LOCAL");
@@ -263,12 +259,11 @@ static int consolekit_called(const char *ck_action, uid_t *uid, uid_t *uid2, con
                        a = ACTION_ADD;
                        u = u2;
                }
-
                break;
        case ACTION_NONE:
                break;
        default:
-               g_assert_not_reached ();
+               g_assert_not_reached();
                break;
        }