sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-30 06:50:24 +03:00
Code

selftest: Preload resolv_wrapper in selftest.

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2014-09-03 17:16:36 +02:00 committed by Andrew Bartlett
parent 064d40f4d3
commit 843d81a14f
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
selftest/selftest.pl
View File

@ -53,6 +53,7 @@ my $opt_resetup_env = undef;
my $opt_binary_mapping = "";
my $opt_load_list = undef;
my $opt_libnss_wrapper_so_path = "";
my $opt_libresolv_wrapper_so_path = "";
my $opt_libsocket_wrapper_so_path = "";
my $opt_libuid_wrapper_so_path = "";
my @testlists = ();
@ -200,6 +201,7 @@ Paths:
Preload cwrap:
--nss_wrapper_so_path=FILE the nss_wrapper library to preload
--resolv_wrapper_so_path=FILE the resolv_wrapper library to preload
--socket_wrapper_so_path=FILE the socket_wrapper library to preload
--uid_wrapper_so_path=FILE the uid_wrapper library to preload
@ -243,6 +245,7 @@ my $result = GetOptions (
'load-list=s' => \$opt_load_list,
'binary-mapping=s' => \$opt_binary_mapping,
'nss_wrapper_so_path=s' => \$opt_libnss_wrapper_so_path,
'resolv_wrapper_so_path=s' => \$opt_libresolv_wrapper_so_path,
'socket_wrapper_so_path=s' => \$opt_libsocket_wrapper_so_path,
'uid_wrapper_so_path=s' => \$opt_libuid_wrapper_so_path
);
@ -350,6 +353,14 @@ if ($opt_libnss_wrapper_so_path) {
}
}
if ($opt_libresolv_wrapper_so_path) {
if ($ld_preload) {
$ld_preload = "$ld_preload:$opt_libresolv_wrapper_so_path";
} else {
$ld_preload = "$opt_libresolv_wrapper_so_path";
}
}
if ($opt_libsocket_wrapper_so_path) {
if ($ld_preload) {
$ld_preload = "$ld_preload:$opt_libsocket_wrapper_so_path";

1
selftest/wscript
View File

@ -211,6 +211,7 @@ def cmd_testonly(opt):
env.SELFTEST_TARGET = "samba3"
env.OPTIONS += " --nss_wrapper_so_path=" + CONFIG_GET(opt, 'LIBNSS_WRAPPER_SO_PATH')
env.OPTIONS += " --resolv_wrapper_so_path=" + CONFIG_GET(opt, 'LIBRESOLV_WRAPPER_SO_PATH')
env.OPTIONS += " --socket_wrapper_so_path=" + CONFIG_GET(opt, 'LIBSOCKET_WRAPPER_SO_PATH')
env.OPTIONS += " --uid_wrapper_so_path=" + CONFIG_GET(opt, 'LIBUID_WRAPPER_SO_PATH')