diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-08-03 15:09:46 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-08-03 15:09:46 +0200 |
| commit | 939cc18afc49ee8479572c14c7fa777646fd4add (patch) | |
| tree | 660de1cd044521a88fa0de84e01832eab61336bc /extras/udev-acl/udev-acl.c | |
| parent | 8e5a620b17c08b0b6277236203ee559b7dadd1d4 (diff) | |
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
Diffstat (limited to 'extras/udev-acl/udev-acl.c')
| -rw-r--r-- | extras/udev-acl/udev-acl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/extras/udev-acl/udev-acl.c b/extras/udev-acl/udev-acl.c index ff04ec6bed..f2b50051c1 100644 --- 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; } |