From 13d98d68fc8eb9d91adda007e6302c9857e02ceb Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 18 Dec 2008 11:52:06 +0000
Subject: [PATCH] Misc daemon fixes (John Levon)

---
 ChangeLog      | 6 ++++++
 qemud/qemud.c  | 4 ++--
 qemud/remote.c | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ebad9268c2..0af5242487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 18 11:50:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	Misc daemon bug fixes (John Levon)
+	* qemud/qemud.c: Fix conditional for node devices
+	* qemud/remote.c: Remove unneccessary path.h include
+
 Thu Dec 18 07:47:58 +0100 2008 Jim Meyering <meyering@redhat.com>
 
 	docs/virsh.pod: typo fix
diff --git a/qemud/qemud.c b/qemud/qemud.c
index ed9c594a36..5dcb1e0a19 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <limits.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -801,7 +800,8 @@ static struct qemud_server *qemudInitialize(int sigread) {
 #ifdef WITH_STORAGE_DIR
     storageRegister();
 #endif
-#if defined(HAVE_HAL) || defined(HAVE_DEVKIT)
+#if defined(WITH_NODE_DEVICES) && \
+    (defined(HAVE_HAL) || defined(HAVE_DEVKIT))
     nodedevRegister();
 #endif
 #ifdef WITH_QEMU
diff --git a/qemud/remote.c b/qemud/remote.c
index 0488e6cf0f..ab083a6edb 100644
--- a/qemud/remote.c
+++ b/qemud/remote.c
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <limits.h>
 #include <sys/socket.h>
 #include <sys/un.h>