diff options
| author | Andreas Schneider <asn@samba.org> | 2014-01-31 16:34:25 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:06 +0200 |
| commit | d24a154429864054bd319891f1acd456ff4cbcb1 (patch) | |
| tree | acdaee71f588c84b6261936e0c13e98f7d12f207 /selftest | |
| parent | 5bb410f85312196bb24e62a6a0b8350576433dc6 (diff) | |
| download | samba-d24a154429864054bd319891f1acd456ff4cbcb1.tar.gz samba-d24a154429864054bd319891f1acd456ff4cbcb1.tar.xz samba-d24a154429864054bd319891f1acd456ff4cbcb1.zip | |
selftest: Preload nss_wrapper
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/selftest.pl | 11 | ||||
| -rw-r--r-- | selftest/wscript | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index c4eab453e96..dd964a3439e 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -52,6 +52,7 @@ my $ldap = undef; my $opt_resetup_env = undef; my $opt_binary_mapping = ""; my $opt_load_list = undef; +my $opt_libnss_wrapper_so_path = ""; my $opt_libuid_wrapper_so_path = ""; my @testlists = (); @@ -203,6 +204,7 @@ Paths: --bindir=DIR binaries directory [./bin] Preload cwrap: + --nss_wrapper_so_path=FILE the nss_wrapper library to preload --uid_wrapper_so_path=FILE the uid_wrapper library to preload Target Specific: @@ -244,6 +246,7 @@ my $result = GetOptions ( 'random-order' => \$opt_random_order, 'load-list=s' => \$opt_load_list, 'binary-mapping=s' => \$opt_binary_mapping, + 'nss_wrapper_so_path=s' => \$opt_libnss_wrapper_so_path, 'uid_wrapper_so_path=s' => \$opt_libuid_wrapper_so_path ); @@ -342,6 +345,14 @@ if ($opt_socket_wrapper_pcap) { my $ld_preload = $ENV{LD_PRELOAD}; +if ($opt_libnss_wrapper_so_path) { + if ($ld_preload) { + $ld_preload = "$ld_preload:$opt_libnss_wrapper_so_path"; + } else { + $ld_preload = "$opt_libnss_wrapper_so_path"; + } +} + if ($opt_libuid_wrapper_so_path) { if ($ld_preload) { $ld_preload = "$ld_preload:$opt_libuid_wrapper_so_path"; diff --git a/selftest/wscript b/selftest/wscript index b251370c332..515ca1dfa60 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -200,6 +200,7 @@ def cmd_testonly(opt): else: env.SELFTEST_TARGET="samba3" + env.OPTIONS += " --nss_wrapper_so_path=" + CONFIG_GET(opt, 'LIBNSS_WRAPPER_SO_PATH') env.OPTIONS += " --uid_wrapper_so_path=" + CONFIG_GET(opt, 'LIBUID_WRAPPER_SO_PATH') # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8). |