lib: Move "iov_buf.[ch]" to lib/util

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

lib/async_req/async_sock.c

@@ -27,7 +27,7 @@
 #include <talloc.h>
 #include <tevent.h>
 #include "lib/async_req/async_sock.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 
 /* Note: lib/util/ is currently GPL */
 #include "lib/util/tevent_unix.h"

lib/util/wscript_build

@@ -36,6 +36,11 @@ bld.SAMBA_LIBRARY('socket-blocking',
                   local_include=False,
                   private_library=True)
 
+bld.SAMBA_LIBRARY('iov_buf',
+                  source='iov_buf.c',
+                  local_include=False,
+                  private_library=True)
+
 bld.SAMBA_SUBSYSTEM('samba-util-core',
                     source='''xfile.c data_blob.c util_file.c time.c
                               signal.c util.c idtree.c fault.c

source3/lib/messages.c

@@ -52,7 +52,7 @@
 #include "lib/util/tevent_unix.h"
 #include "lib/background.h"
 #include "lib/messages_dgm.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 #include "lib/util/server_id_db.h"
 #include "lib/messages_dgm_ref.h"
 #include "lib/messages_util.h"

source3/lib/messages_ctdbd.c

@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "messages.h"
 #include "util_tdb.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 
 /*
  * It is not possible to include ctdb.h and tdb_compat.h (included via

source3/lib/msghdr.c

@@ -18,7 +18,7 @@
 
 #include "replace.h"
 #include "lib/msghdr.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 #include <sys/socket.h>
 
 ssize_t msghdr_prep_fds(struct msghdr *msg, uint8_t *buf, size_t bufsize,

source3/lib/sys_rw_data.c

@@ -24,7 +24,7 @@
 #include "system/filesys.h"
 #include "lib/sys_rw_data.h"
 #include "lib/sys_rw.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 
 /****************************************************************************
  Write all data from an iov array

source3/lib/unix_msg/unix_msg.c

@@ -23,7 +23,7 @@
 #include "system/network.h"
 #include "dlinklist.h"
 #include "pthreadpool/pthreadpool.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 #include "lib/msghdr.h"
 #include <fcntl.h>
 

source3/smbd/smb2_server.c

@@ -28,7 +28,7 @@
 #include "smbprofile.h"
 #include "../lib/util/bitmap.h"
 #include "../librpc/gen_ndr/krb5pac.h"
-#include "lib/iov_buf.h"
+#include "lib/util/iov_buf.h"
 #include "auth.h"
 
 static void smbd_smb2_connection_handler(struct tevent_context *ev,

source3/wscript_build

@@ -252,11 +252,6 @@ bld.SAMBA3_LIBRARY('sys_rw',
                    deps='replace iov_buf',
                    private_library=True)
 
-bld.SAMBA3_LIBRARY('iov_buf',
-                   source='lib/iov_buf.c',
-                   deps='replace',
-                   private_library=True)
-
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source='''lib/system.c
                    lib/sendfile.c