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

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

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index b986e45b0aa70d66b4b52529cbac61ff0c71d040..ee91b8f16c82aca525c4453fab3e7c5aee16713c 100644 (file)
--- a/lib/async_req/async_sock.c
+++ b/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"

diff --git a/source3/lib/iov_buf.c b/lib/util/iov_buf.c
similarity index 100%
rename from source3/lib/iov_buf.c
rename to lib/util/iov_buf.c

diff --git a/source3/lib/iov_buf.h b/lib/util/iov_buf.h
similarity index 100%
rename from source3/lib/iov_buf.h
rename to lib/util/iov_buf.h

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 3121e1ff5b2d70ddc0019ae9d6f4d7e20e0bc8cf..258874248573f9b03e5d162a99d2819386ab8a28 100755 (executable)
--- a/lib/util/wscript_build
+++ b/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

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 7df7cdb699d3a2baca710e11f83240d36b7a69c0..aa67640e8cb5a38b0bd2cf53ec0eb6b2253baee0 100644 (file)
--- a/source3/lib/messages.c
+++ b/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"

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index dbca1038e3105fb7517a1595c4408708e6b826f7..1268bd4a5060b169515185ca181f6c9e9cccc1d3 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/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

diff --git a/source3/lib/msghdr.c b/source3/lib/msghdr.c
index 82f7ca7cdee18e2be7cfac0f13dd9ea989476f2a..5d771e8958ef23ea981cad6cf844e0325563c26a 100644 (file)
--- a/source3/lib/msghdr.c
+++ b/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,

diff --git a/source3/lib/sys_rw_data.c b/source3/lib/sys_rw_data.c
index 71987835b4d15131c0f18b9e969907d774ddc869..e3f934de6a1f8de90537c9a5da42502d9d8d26a4 100644 (file)
--- a/source3/lib/sys_rw_data.c
+++ b/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

diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c
index 6714f0d312c8a2b90eb210d8e39181c3be398690..f2422490e6f7db4a2f1553ae1edd75d7814dcf68 100644 (file)
--- a/source3/lib/unix_msg/unix_msg.c
+++ b/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>
 

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 25d11b1eb18a9a6ac9ffeadacca321112683f504..0113378d4c430821ba0c76dd8d36b932a0e5d861 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/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,

diff --git a/source3/wscript_build b/source3/wscript_build
index d166d4e0ed914801e7e2c9470c8e2b4702617f78..24cf06c4f8c3da0f0837c124a7527c2fa7bcb806 100755 (executable)
--- a/source3/wscript_build
+++ b/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