[PATCH 15/31] selftest: Preload resolv_wrapper in selftest.

[Andreas Schneider]

Signed-off-by: Andreas Schneider <asn at samba.org>
---
 selftest/selftest.pl | 11 +++++++++++
 selftest/wscript     |  1 +
 2 files changed, 12 insertions(+)

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ea63ee5..166d40a 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -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";
diff --git a/selftest/wscript b/selftest/wscript
index d1d7425..fd3c89a 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -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')
 
-- 
2.1.3