sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s3:util: Move popen wrappers to lib/util

Browse Source 
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.

Signed-off-by: Aliaksei Karaliou <akaraliou@panasas.com>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Aliaksei Karaliou 2018-12-27 04:18:28 -05:00 committed by Andrew Bartlett
parent 724c07fe13
commit 65ea3f2a46
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/sys_popen.c → lib/util/sys_popen.c
View File

@ -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"
/**************************************************************************

0
source3/lib/sys_popen.h → lib/util/sys_popen.h
View File

4
lib/util/wscript_build
View File

@ -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',

2
source3/lib/util_file.c
View File

@ -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"

1
source3/wscript_build
View File

@ -302,7 +302,6 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
lib/util_sock.c
lib/util_tsock.c
lib/util_transfer_file.c
lib/sys_popen.c
''',
deps='''
CHARSET3