selftest: extend setup_plugin_s4_dc to allow for not using nss_winbindd
authorMichael Adam <obnox@samba.org>
Thu, 5 Mar 2015 12:22:07 +0000 (13:22 +0100)
committerMichael Adam <obnox@samba.org>
Thu, 12 Mar 2015 13:35:06 +0000 (14:35 +0100)
Pair-Programmed-With: Guenther Deschner <gd@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
selftest/target/Samba4.pm

index da2009d95da543b94f8b9277510570a5fea3f606..2535ab6ef5b40f24278e863d1f6d619c83b3239d 100755 (executable)
@@ -2274,7 +2274,7 @@ sub setup_rodc($$$)
 
 sub setup_plugin_s4_dc($$)
 {
-       my ($self, $path) = @_;
+       my ($self, $path, $no_nss) = @_;
 
        # If we didn't build with ADS, pretend this env was never available
        if (not $self->{target3}->have_ads()) {
@@ -2286,6 +2286,11 @@ sub setup_plugin_s4_dc($$)
                return undef;
        }
 
+       if (defined($no_nss) and $no_nss) {
+               $env->{NSS_WRAPPER_MODULE_SO_PATH} = undef;
+               $env->{NSS_WRAPPER_MODULE_FN_PREFIX} = undef;
+       }
+
        $self->check_or_start($env, "single");
        
        $self->wait_for_start($env);