r13658: More moving around of files:

 - Collect the generic utility functions into a lib/util/ (a la GLib is
		for the GNOME folks)
 - Remove even more files from include/
(This used to be commit ba62880f5b05c2a505dc7f54676b231197a7e707)

6 files changed, 11 insertions, 19 deletions

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index 3fc3c09316..6548a2c199 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -31,6 +31,7 @@
 #include "messaging/messaging.h"
 #include "db_wrap.h"
 #include "lib/messaging/irpc.h"
+#include "libcli/libcli.h"
 
 /*
   in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies
@@ -237,7 +238,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
 	struct lock_struct lock, *locks=NULL;
 	NTSTATUS status;
 
-	kbuf.dptr = (char *)file_key->data;
+	kbuf.dptr = (uint8_t *)file_key->data;
 	kbuf.dsize = file_key->length;
 
 	if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
@@ -287,7 +288,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
 		status = NT_STATUS_NO_MEMORY;
 		goto fail;
 	} else {
-		dbuf.dptr = (char *)locks;
+		dbuf.dptr = (uint8_t *)locks;
 	}
 	locks[count] = lock;
 	dbuf.dsize += sizeof(lock);
@@ -382,7 +383,7 @@ NTSTATUS brl_unlock(struct brl_context *brl,
 	struct lock_context context;
 	NTSTATUS status;
 
-	kbuf.dptr = (char *)file_key->data;
+	kbuf.dptr = (uint8_t *)file_key->data;
 	kbuf.dsize = file_key->length;
 
 	if (tdb_chainlock(brl->w->tdb, kbuf) != 0) {
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 74b62809f7..8194fc1963 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -59,16 +59,6 @@ OBJ_FILES = \
 # End MODULE ntvfs_nbench
 ################################################
 
-################################################
-# Start SUBSYSTEM ntvfs_common
-[SUBSYSTEM::ntvfs_common]
-OBJ_FILES = \
-		common/brlock.o \
-		common/opendb.o \
-		common/sidmap.o
-# End SUBSYSTEM ntvfs_common
-################################################
-
 
 ################################################
 # Start SUBSYSTEM NTVFS
@@ -83,7 +73,10 @@ OBJ_FILES = \
 		ntvfs_base.o \
 		ntvfs_generic.o \
 		ntvfs_interface.o \
-		ntvfs_util.o
+		ntvfs_util.o \
+		common/brlock.o \
+		common/opendb.o \
+		common/sidmap.o
 #
 # End SUBSYSTEM NTVFS
 ################################################
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index a2a4685d8c..85fcc10e06 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -31,6 +31,6 @@ OBJ_FILES = \
 		pvfs_acl.o \
 		xattr_system.o \
 		xattr_tdb.o
-REQUIRED_SUBSYSTEMS = NDR_XATTR ntvfs_common EXT_LIB_XATTR EXT_LIB_BLKID
+REQUIRED_SUBSYSTEMS = NDR_XATTR EXT_LIB_XATTR EXT_LIB_BLKID
 # End MODULE ntvfs_posix
 ################################################
diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c
index abf575aa3d..b35a98fa87 100644
--- a/source4/ntvfs/posix/pvfs_ioctl.c
+++ b/source4/ntvfs/posix/pvfs_ioctl.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 
 /*
   old ioctl interface 
diff --git a/source4/ntvfs/print/vfs_print.c b/source4/ntvfs/print/vfs_print.c
index e933f5502b..b0c34b2abe 100644
--- a/source4/ntvfs/print/vfs_print.c
+++ b/source4/ntvfs/print/vfs_print.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "ioctl.h"
+#include "libcli/raw/ioctl.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk
index d99229729c..bb811bca2b 100644
--- a/source4/ntvfs/unixuid/config.mk
+++ b/source4/ntvfs/unixuid/config.mk
@@ -5,7 +5,5 @@ INIT_FUNCTION = ntvfs_unixuid_init
 SUBSYSTEM = NTVFS
 OBJ_FILES = \
 		vfs_unixuid.o
-REQUIRED_SUBSYSTEMS = \
-		ntvfs_common
 # End MODULE ntvfs_unixuid
 ################################################