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

diff --git a/cliserv.h b/cliserv.h
index 4f7aa78..612fa2b 100644
--- a/cliserv.h
+++ b/cliserv.h
@@ -9,10 +9,11 @@
    Send 128 bytes of zeros (reserved for future use)
  */
 
-#include "config.h"
 #include <errno.h>
 #include <string.h>
 #include <netdb.h>
+#include <netinet/tcp.h>
+#include <stdlib.h>
 
 #if SIZEOF_UNSIGNED_SHORT_INT==4
 typedef unsigned short u32;
@@ -24,7 +25,6 @@ typedef unsigned long u32;
 #error I need at least some 32-bit type
 #endif
 
-#ifndef	FS_32BIT
 #if SIZEOF_UNSIGNED_INT==8
 typedef unsigned int u64;
 #elif SIZEOF_UNSIGNED_LONG_INT==8
@@ -34,15 +34,20 @@ typedef unsigned long long u64;
 #else
 #error I need at least some 64-bit type
 #endif
-#endif	/* FS_32BIT */
 
+#ifdef NBD_H_LOCAL
+#include "nbd.h"
+#endif
+#ifdef NBD_H_LINUX
 #include <linux/nbd.h>
+#endif
 
-#ifdef	FS_32BIT
-struct { unsigned char m[8]; } cliserv_magic = { { 0x00, 0x00, 0x42, 0x02, 0x81, 0x86, 0x12, 0x53 } };
-#else
-u64 cliserv_magic = 0x00420281861253LL;
+#if NBD_LFS==1
+#define _LARGEFILE_SOURCE
+#define _FILE_OFFSET_BITS 64
 #endif
+
+u64 cliserv_magic = 0x00420281861253LL;
 #define INIT_PASSWD "NBDMAGIC"
 
 #define INFO(a) do { } while(0)
@@ -89,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
@@ -105,7 +110,6 @@ void logging(void)
 	setvbuf(stderr, NULL, _IONBF, 0);
 }
 
-#ifndef	FS_32BIT
 #ifdef WORDS_BIGENDIAN
 u64 ntohll(u64 a)
 {
@@ -122,4 +126,3 @@ u64 ntohll(u64 a)
 }
 #endif
 #define htonll ntohll
-#endif	/* FS_32BIT */