selftest: Remove obsolete LDAP backend hooks from selftest.pl et al

This removes some quite complex logic that has not been used since the LDAP
backend project was shelved prior to 2011.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 5d4fcf257342cae09afb9b0e3d97994f47b79186..6139f3daa7dd2c257cb8754f20cb9b4cbd143863 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -53,7 +53,6 @@ my @opt_include_env = ();
 my $opt_testenv = 0;
 my $opt_list = 0;
 my $opt_mitkrb5 = 0;
-my $ldap = undef;
 my $opt_resetup_env = undef;
 my $opt_load_list = undef;
 my $opt_libnss_wrapper_so_path = "";
@@ -238,9 +237,6 @@ Target Specific:
                             failed
  --socket-wrapper           enable socket wrapper
 
-Samba4 Specific:
- --ldap=openldap|fedora-ds  back samba onto specified ldap server
-
 Behaviour:
  --quick                    run quick overall test
  --one                      abort when the first test fails
@@ -268,7 +264,6 @@ my $result = GetOptions (
                'testenv' => \$opt_testenv,
                'list' => \$opt_list,
                'mitkrb5' => \$opt_mitkrb5,
-               'ldap:s' => \$ldap,
                'resetup-environment' => \$opt_resetup_env,
                'testlist=s' => \@testlists,
                'random-order' => \$opt_random_order,
@@ -306,20 +301,7 @@ $ENV{TZ} = "UTC";
 
 my $bindir_abs = abs_path($bindir);
 
-# Backwards compatibility:
-if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") {
-       if (defined($ENV{FEDORA_DS_ROOT})) {
-               $ldap = "fedora-ds";
-       } else {
-               $ldap = "openldap";
-       }
-}
-
 my $torture_maxtime = ($ENV{TORTURE_MAXTIME} or 1200);
-if ($ldap) {
-       # LDAP is slow
-       $torture_maxtime *= 2;
-}
 
 $prefix =~ s+//+/+;
 $prefix =~ s+/./+/+;
@@ -488,7 +470,7 @@ if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
     $server_maxtime = $ENV{SMBD_MAXTIME};
 }
 
-$target = new Samba($bindir, $ldap, $srcdir, $server_maxtime);
+$target = new Samba($bindir, $srcdir, $server_maxtime);
 unless ($opt_list) {
        if ($opt_target eq "samba") {
                $testenv_default = "ad_dc";

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index ca3099c9d0571105810cf8303c1fd60097b8c19f..996bdae188aa9dabae70aff9b38a4a360e7b83ea 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -12,11 +12,11 @@ use POSIX;
 use Cwd qw(abs_path);
 
 sub new($$$$$) {
-       my ($classname, $bindir, $ldap, $srcdir, $server_maxtime) = @_;
+       my ($classname, $bindir, $srcdir, $server_maxtime) = @_;
 
        my $self = {
            samba3 => new Samba3($bindir, $srcdir, $server_maxtime),
-           samba4 => new Samba4($bindir, $ldap, $srcdir, $server_maxtime),
+           samba4 => new Samba4($bindir, $srcdir, $server_maxtime),
        };
        bless $self;
        return $self;

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 8048eba8b54d0f0ff2949afc4345849a4ce85c79..9df9e84ff63e97b11e6d31f6b212f2d99a50fe0a 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -19,11 +19,10 @@ use Archive::Tar;
 use File::Path 'make_path';
 
 sub new($$$$$) {
-       my ($classname, $bindir, $ldap, $srcdir, $server_maxtime) = @_;
+       my ($classname, $bindir, $srcdir, $server_maxtime) = @_;
 
        my $self = {
                vars => {},
-               ldap => $ldap,
                bindir => $bindir,
                srcdir => $srcdir,
                server_maxtime => $server_maxtime,
@@ -38,57 +37,6 @@ sub scriptdir_path($$) {
        return "$self->{srcdir}/source4/scripting/$path";
 }
 
-sub openldap_start($$$) {
-}
-
-sub slapd_start($$)
-{
-       my $count = 0;
-       my ($self, $env_vars, $STDIN_READER) = @_;
-       my $ldbsearch = Samba::bindir_path($self, "ldbsearch");
-
-       my $uri = $env_vars->{LDAP_URI};
-
-       if (system("$ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") == 0) {
-           print "A SLAPD is still listening to $uri before we started the LDAP backend.  Aborting!";
-           return 1;
-       }
-       # running slapd in the background means it stays in the same process group, so it can be
-       # killed by timelimit
-       my $pid = fork();
-       if ($pid == 0) {
-               open STDOUT, ">$env_vars->{LDAPDIR}/logs";
-               open STDERR, '>&STDOUT';
-               close($env_vars->{STDIN_PIPE});
-               open STDIN, ">&", $STDIN_READER or die "can't dup STDIN_READER to STDIN: $!";
-
-               if ($self->{ldap} eq "fedora-ds") {
-                       exec("$ENV{FEDORA_DS_ROOT}/sbin/ns-slapd", "-D", $env_vars->{FEDORA_DS_DIR}, "-d0", "-i", $env_vars->{FEDORA_DS_PIDFILE});
-               } elsif ($self->{ldap} eq "openldap") {
-                       exec($ENV{OPENLDAP_SLAPD}, "-dnone", "-F", $env_vars->{SLAPD_CONF_D}, "-h", $uri);
-               }
-               die("Unable to start slapd: $!");
-       }
-       $env_vars->{SLAPD_PID} = $pid;
-       sleep(1);
-       while (system("$ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") != 0) {
-               $count++;
-               if ($count > 40) {
-                       $self->slapd_stop($env_vars);
-                       return 0;
-               }
-               sleep(1);
-       }
-       return 1;
-}
-
-sub slapd_stop($$)
-{
-       my ($self, $envvars) = @_;
-       kill 9, $envvars->{SLAPD_PID};
-       return 1;
-}
-
 sub check_or_start($$$)
 {
         my ($self, $env_vars, $process_model) = @_;
@@ -107,14 +55,6 @@ sub check_or_start($$$)
        # exit when the test script exits
        pipe($STDIN_READER, $env_vars->{STDIN_PIPE});
 
-       # Start slapd before samba, but with the fifo on stdin
-       if (defined($self->{ldap})) {
-               unless($self->slapd_start($env_vars, $STDIN_READER)) {
-                       warn("couldn't start slapd (main run)");
-                       return undef;
-               }
-       }
-
        # build up the command to run samba
        my @preargs = ();
        my @optargs = ();
@@ -329,28 +269,6 @@ type: 0x3
 ");
 }
 
-sub mk_fedora_ds($$)
-{
-       my ($self, $ctx) = @_;
-
-       #Make the subdirectory be as fedora DS would expect
-       my $fedora_ds_dir = "$ctx->{ldapdir}/slapd-$ctx->{ldap_instance}";
-
-       my $pidfile = "$fedora_ds_dir/logs/slapd-$ctx->{ldap_instance}.pid";
-
-       return ($fedora_ds_dir, $pidfile);
-}
-
-sub mk_openldap($$)
-{
-       my ($self, $ctx) = @_;
-
-       my $slapd_conf_d = "$ctx->{ldapdir}/slapd.d";
-       my $pidfile = "$ctx->{ldapdir}/slapd.pid";
-
-       return ($slapd_conf_d, $pidfile);
-}
-
 sub setup_dns_hub_internal($$$)
 {
        my ($self, $hostname, $prefix) = @_;
@@ -1225,39 +1143,11 @@ sub provision($$$$$$$$$$)
 $extra_smbconf_shares
 ";
 
-       if (defined($self->{ldap})) {
-               $ctx->{ldapdir} = "$ctx->{privatedir}/ldap";
-               push(@{$ctx->{directories}}, "$ctx->{ldapdir}");
-
-               my $ldap_uri= "$ctx->{ldapdir}/ldapi";
-               $ldap_uri =~ s|/|%2F|g;
-               $ldap_uri = "ldapi://$ldap_uri";
-               $ctx->{ldap_uri} = $ldap_uri;
-
-               $ctx->{ldap_instance} = lc($ctx->{netbiosname});
-       }
-
        my $ret = $self->provision_raw_step1($ctx);
        unless (defined $ret) {
                return undef;
        }
 
-       if (defined($self->{ldap})) {
-               $ret->{LDAP_URI} = $ctx->{ldap_uri};
-               push (@{$ctx->{provision_options}}, "--ldap-backend-type=" . $self->{ldap});
-               push (@{$ctx->{provision_options}}, "--ldap-backend-nosync");
-               if ($self->{ldap} eq "openldap") {
-                       push (@{$ctx->{provision_options}}, "--slapd-path=" . $ENV{OPENLDAP_SLAPD});
-                       ($ret->{SLAPD_CONF_D}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ctx) or die("Unable to create openldap directories");
-
-                } elsif ($self->{ldap} eq "fedora-ds") {
-                       push (@{$ctx->{provision_options}}, "--slapd-path=" . "$ENV{FEDORA_DS_ROOT}/sbin/ns-slapd");
-                       push (@{$ctx->{provision_options}}, "--setup-ds-path=" . "$ENV{FEDORA_DS_ROOT}/sbin/setup-ds.pl");
-                       ($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ctx) or die("Unable to create fedora ds directories");
-               }
-
-       }
-
        return $self->provision_raw_step2($ctx, $ret);
 }
 
@@ -2101,8 +1991,6 @@ sub teardown_env($$)
        my ($self, $envvars) = @_;
        teardown_env_terminate($self, $envvars);
 
-       $self->slapd_stop($envvars) if ($self->{ldap});
-
        print $self->getlog_env($envvars);
 
        return;