lib/messaging: Move messages_dgm out of source3

... so CTDB can also use it. Signed-off-by: Amitay Isaacs <[email protected]> Reviewed-by: Volker Lendecke <[email protected]>
kounelios13 · May 6, 2020 · 93408f6 · 93408f6
1 parent 8d22b9e
commit 93408f6
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 26 deletions.
diff --git a/source3/lib/messages_dgm.c → lib/messaging/messages_dgm.c b/source3/lib/messages_dgm.c → lib/messaging/messages_dgm.c
@@ -24,7 +24,7 @@
 #include "system/dir.h"
 #include "system/select.h"
 #include "lib/util/debug.h"
-#include "lib/messages_dgm.h"
+#include "messages_dgm.h"
 #include "lib/util/genrand.h"
 #include "lib/util/dlinklist.h"
 #include "lib/pthreadpool/pthreadpool_tevent.h"

diff --git a/source3/lib/messages_dgm.h → lib/messaging/messages_dgm.h b/source3/lib/messages_dgm.h → lib/messaging/messages_dgm.h
diff --git a/source3/lib/messages_dgm_ref.c → lib/messaging/messages_dgm_ref.c b/source3/lib/messages_dgm_ref.c → lib/messaging/messages_dgm_ref.c
diff --git a/source3/lib/messages_dgm_ref.h → lib/messaging/messages_dgm_ref.h b/source3/lib/messages_dgm_ref.h → lib/messaging/messages_dgm_ref.h
diff --git a/lib/messaging/wscript_build b/lib/messaging/wscript_build
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+bld.SAMBA_LIBRARY('messages_dgm',
+                  source='''
+                         messages_dgm.c
+                         messages_dgm_ref.c
+                         ''',
+                  deps='''
+                       talloc
+                       samba-debug
+                       PTHREADPOOL
+                       msghdr
+                       genrand
+                       samba-util
+                       ''',
+                  private_library=True)
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
@@ -52,10 +52,10 @@
 #include "messages.h"
 #include "lib/util/tevent_unix.h"
 #include "lib/background.h"
-#include "lib/messages_dgm.h"
+#include "lib/messaging/messages_dgm.h"
 #include "lib/util/iov_buf.h"
 #include "lib/util/server_id_db.h"
-#include "lib/messages_dgm_ref.h"
+#include "lib/messaging/messages_dgm_ref.h"
 #include "lib/messages_ctdb.h"
 #include "lib/messages_ctdb_ref.h"
 #include "lib/messages_util.h"

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
@@ -23,7 +23,7 @@
 #include "lib/param/param.h"
 #include "ctdbd_conn.h"
 #include "lib/messages_ctdb.h"
-#include "lib/messages_dgm.h"
+#include "lib/messaging/messages_dgm.h"
 
 static bool serverid_exists_local(const struct server_id *id)
 {

diff --git a/source3/lib/util.c b/source3/lib/util.c
@@ -29,7 +29,7 @@
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
 #include "messages.h"
-#include "messages_dgm.h"
+#include "lib/messaging/messages_dgm.h"
 #include "libcli/security/security.h"
 #include "serverid.h"
 #include "lib/util/sys_rw.h"

diff --git a/source3/lib/util_procid.c b/source3/lib/util_procid.c
@@ -23,7 +23,7 @@
 
 #include "util_procid.h"
 #include "lib/util/debug.h"
-#include "lib/messages_dgm.h"
+#include "lib/messaging/messages_dgm.h"
 
 pid_t procid_to_pid(const struct server_id *proc)
 {

diff --git a/source3/wscript_build b/source3/wscript_build
@@ -360,21 +360,6 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
                           samba-cluster-support
                           ''')
 
-bld.SAMBA3_LIBRARY('messages_dgm',
-                   source='''
-                          lib/messages_dgm.c
-                          lib/messages_dgm_ref.c
-                          ''',
-                   deps='''
-                        talloc
-                        samba-debug
-                        PTHREADPOOL
-                        msghdr
-                        genrand
-			samba-util
-                        ''',
-                   private_library=True)
-
 bld.SAMBA3_LIBRARY('messages_util',
                    source='''lib/messages_util.c''',
                    deps='samba-util',

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
@@ -36,8 +36,8 @@
 #include "lib/param/param.h"
 #include "lib/util/server_id_db.h"
 #include "lib/util/talloc_report_printf.h"
-#include "../source3/lib/messages_dgm.h"
-#include "../source3/lib/messages_dgm_ref.h"
+#include "lib/messaging/messages_dgm.h"
+#include "lib/messaging/messages_dgm_ref.h"
 #include "../source3/lib/messages_util.h"
 #include <tdb.h>
 

diff --git a/source4/lib/messaging/messaging_send.c b/source4/lib/messaging/messaging_send.c
@@ -22,8 +22,8 @@
 #include "includes.h"
 #include "messaging/messaging.h"
 #include "messaging/irpc.h"
-#include "../source3/lib/messages_dgm.h"
-#include "../source3/lib/messages_dgm_ref.h"
+#include "lib/messaging/messages_dgm.h"
+#include "lib/messaging/messages_dgm_ref.h"
 #include "../source3/lib/messages_util.h"
 #include "messaging/messaging_internal.h"
 #include "lib/util/server_id_db.h"

diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
@@ -30,7 +30,7 @@
 #include "ldb_wrap.h"
 #include "lib/messaging/messaging.h"
 #include "lib/util/debug.h"
-#include "source3/lib/messages_dgm.h"
+#include "lib/messaging/messages_dgm.h"
 #include "lib/util/util_process.h"
 
 static unsigned connections_active = 0;

diff --git a/wscript_build b/wscript_build
@@ -53,6 +53,7 @@ bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('lib/printer_driver')
 bld.RECURSE('lib/audit_logging')
+bld.RECURSE('lib/messaging')
 bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
 bld.RECURSE('python')