hal: Branch 'master'

[David Zeuthen]

 Makefile.am       |   28 ++--------------------------
 hald/ci-tracker.c |    2 +-
 hald/hald_dbus.c  |    6 +++++-
 3 files changed, 8 insertions(+), 28 deletions(-)

New commits:
diff-tree f4682e40a6d647c255e8e0405db4a4ba47a0cb2f (from 383c9dcff3b29bd7bdcdf4e232ee41cabb004927)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Apr 6 17:27:04 2007 -0400

    make distcheck happy again and remove ChangeLog from tarballs
    
    The contents of the ChangeLog file are already in NEWS.

diff --git a/Makefile.am b/Makefile.am
index 64040d0..8a4c8da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,33 +9,9 @@ pkgconfig_DATA = hal.pc hal-storage.pc
 dbusdir = $(DBUS_SYS_DIR)
 dist_dbus_DATA = hal.conf
 
-MAINTAINERCLEANFILES = ChangeLog
+DISTCLEANFILES = hal.pc hal-storage.pc
 
-# Creating ChangeLog from git log (taken from cairo/Makefile.am):
-
-ChangeLog: $(srcdir)/ChangeLog
-
-$(srcdir)/ChangeLog:
-	@if test -d "$(srcdir)/.git"; then \
-	  (cd "$(srcdir)" && \
-	  ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-.PHONY: ChangeLog $(srcdir)/ChangeLog
-
-DISTCLEANFILES = hal.pc hal-storage.pc intltool-extract intltool-merge intltool-update
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-policy-kit
-
-EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in intltool-extract.in intltool-merge.in intltool-update.in mkinstalldirs ChangeLog
+EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in
 
 clean-local :
 	rm -f *~
diff --git a/hald/ci-tracker.c b/hald/ci-tracker.c
index 43dc12c..e1d31eb 100644
--- a/hald/ci-tracker.c
+++ b/hald/ci-tracker.c
@@ -72,9 +72,9 @@ caller_info_free (CICallerInfo *ci)
 {
 #ifdef HAVE_CONKIT
 	g_free (ci->session_objpath);
+        g_free (ci->selinux_context);
 #endif
 	g_free (ci->system_bus_unique_name);
-        g_free (ci->selinux_context);
 	g_free (ci);
 }
 
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index c1727ee..eecd2ab 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3752,10 +3752,12 @@ hald_exec_method (HalDevice *d, CICaller
 	DBusMessageIter iter;
 	char *extra_env[6];
 	char uid_export[256];
+	char sender_export[256];
+#ifdef HAVE_CONKIT
         char pid_export[256];
         char selinux_context_export[256];
-	char sender_export[256];
         char ck_session_path_export[256];
+#endif
 	MethodInvocation *mi;
 
 	/* add extra information about the caller... */
@@ -3769,8 +3771,10 @@ hald_exec_method (HalDevice *d, CICaller
 		extra_env[0] = "HAL_METHOD_INVOKED_BY_UID=0";
 	} else {
                 int n;
+#ifdef HAVE_CONKIT
                 const char *selinux_context;
                 const char *ck_session_path;
+#endif
 
                 n = 0;
 		sprintf (uid_export, "HAL_METHOD_INVOKED_BY_UID=%u", ci_tracker_caller_get_uid (ci));