selftest: Preload nss_wrapper

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index c4eab453e96dad203e2578870835fc777d5bdf2a..dd964a3439ec186c3081d3b968c3bef5420bb5b6 100755 (executable)
--- 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 b251370c332e54c69a0b4fcf560acb6a00063482..515ca1dfa60f39e3adcabedb6a9acf8b3745c3e0 100644 (file)
--- 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).