X-Git-Url: http://git.alex.org.uk

diff --git a/cliserv.h b/cliserv.h
index 5d6dc48..612fa2b 100644
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,14 +35,11 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
-#ifdef HAVE_LOCAL_NBD_H
+#ifdef NBD_H_LOCAL
 #include "nbd.h"
-#else
-#ifdef HAVE_LINUX_NBD_H
-#include <linux/nbd.h>
-#else
-#error I need an nbd.h somewhere. Either install it in <linux/nbd.h> or put it in the current directory.
 #endif
+#ifdef NBD_H_LINUX
+#include <linux/nbd.h>
 #endif
 
 #if NBD_LFS==1
@@ -97,7 +94,7 @@ void err(const char *s)
 
 	s1[maxlen-1] = '\0';
 #ifdef ISSERVER
-	syslog(LOG_ERR, s1);
+	syslog(LOG_ERR, "%s", s1);
 #else
 	fprintf(stderr, "Error: %s\n", s1);
 #endif