s3:util: Move popen wrappers to lib/util

When linked into Samba3 libraries, sys_popen()/sys_pclose()
cannot be used in lower level libraries because of circular
dependencies.

This patch moves them into common samba-util library.

Extra fix needed to enable easy back-port of code for:

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13964

Signed-off-by: Aliaksei Karaliou <akaraliou@panasas.com>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 65ea3f2a461c0eeca7d14c4258eea52e19f0ed06)

diff --git a/source3/lib/sys_popen.c b/lib/util/sys_popen.c
similarity index 99%
rename from source3/lib/sys_popen.c
rename to lib/util/sys_popen.c
index 607e599cf3f89a1dc9c96dc0f0317918d31fafd2..709f1822f332109934fe0985abd626abe12b55d6 100644 (file)
--- a/source3/lib/sys_popen.c
+++ b/lib/util/sys_popen.c
@@ -21,7 +21,7 @@
 #include "system/wait.h"
 #include "system/filesys.h"
 #include <talloc.h>
-#include "lib/sys_popen.h"
+#include "lib/util/sys_popen.h"
 #include "lib/util/debug.h"
 
 /**************************************************************************

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

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 8fc402062fbdf8cefbd44d67dc050a2884b86b49..6134ca666416264d38ffefff1913af21daf72c41 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -68,14 +68,14 @@ bld.SAMBA_LIBRARY('talloc_report',
                   )
 
 bld.SAMBA_SUBSYSTEM('samba-util-core',
-                    source='''data_blob.c util_file.c time.c
+                    source='''data_blob.c util_file.c sys_popen.c time.c
                               signal.c util.c idtree.c fault.c
                               substitute.c util_process.c util_strlist.c
                               strv_util.c bitmap.c select.c pidfile.c
                               become_daemon.c mkdir_p.c''',
                     deps='''time-basic samba-debug socket-blocking talloc
                             tevent execinfo pthread strv tini''',
-                    public_deps='systemd systemd-daemon',
+                    public_deps='systemd systemd-daemon sys_rw',
                     local_include=False)
 
 bld.SAMBA_LIBRARY('iov_buf',

diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index d3139e55b57eb76417118dd7e2d3d3e9a374715b..94e1118225f9064696e269157634687162453925 100644 (file)
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -22,7 +22,7 @@
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 #include "lib/util/sys_rw.h"
-#include "lib/sys_popen.h"
+#include "lib/util/sys_popen.h"
 #include "lib/async_req/async_sock.h"
 #include "lib/util/tevent_unix.h"
 

diff --git a/source3/wscript_build b/source3/wscript_build
index bbcfc72a71479cc7ea7dea5d200a55eacfa82714..6be87ba8139b32233d8710d64efca866f980f5a3 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -312,7 +312,6 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                           lib/util_sock.c
                           lib/util_tsock.c
                           lib/util_transfer_file.c
-                          lib/sys_popen.c
                           ''',
                    deps='''
                         CHARSET3