hal: Branch 'master' - 2 commits

[David Zeuthen]

 hald/access-check.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree b2ab695dd714f55eeaa0beafaf4ac53a95d4e446 (from parents)
Merge: 8a151accd08babe666a6eb597a45d2a96a6a672b 6efebcfcfe690ce8f8f2e2976bf100032d853f19
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Aug 28 12:05:38 2007 -0400

    Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal

diff-tree 8a151accd08babe666a6eb597a45d2a96a6a672b (from 60d18a1852680559c8db96e25e09e62048ad3669)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Aug 28 12:04:35 2007 -0400

    avoid setting SELinux context on the PolKitCaller object if it's non-existant

diff --git a/hald/access-check.c b/hald/access-check.c
index a9f7bb4..b664ef6 100644
--- a/hald/access-check.c
+++ b/hald/access-check.c
@@ -163,6 +163,7 @@ get_pk_caller_from_ci_tracker (CITracker
         PolKitSession *pk_session;
         PolKitCaller *pk_caller;
         const char *ck_session_objpath;
+        const char *selinux_context;
         
         pk_caller = NULL;
 
@@ -192,7 +193,10 @@ get_pk_caller_from_ci_tracker (CITracker
         polkit_caller_set_dbus_name (pk_caller, caller_unique_sysbus_name);
         polkit_caller_set_uid (pk_caller, ci_tracker_caller_get_uid (ci));
         polkit_caller_set_pid (pk_caller, ci_tracker_caller_get_pid (ci));
-        polkit_caller_set_selinux_context (pk_caller, ci_tracker_caller_get_selinux_context (ci));
+        selinux_context = ci_tracker_caller_get_selinux_context (ci);
+        if (selinux_context != NULL) {
+                polkit_caller_set_selinux_context (pk_caller, selinux_context);
+        }
         if (pk_session != NULL) {
                 polkit_caller_set_ck_session (pk_caller, pk_session);
                 polkit_session_unref (pk_session);