From c41fe665e4a4229ec663f03093c2b6b1c4648b86 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 11 Apr 2007 05:01:02 +0000
Subject: r22162: get the TEST_LDAP mode working again

Andrew Bartlett
(This used to be commit 529575d07aeb269927315eaff121408c1beefa59)
---
 source4/script/tests/Samba4.pm      | 18 +++++++++---------
 source4/script/tests/mk-openldap.sh |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'source4/script/tests')

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index cbb128563b..48e7d3aaa6 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -27,11 +27,11 @@ sub slapd_start($$)
 	# running slapd in the background means it stays in the same process group, so it can be
 	# killed by timelimit
 	if (defined($ENV{FEDORA_DS_PREFIX})) {
-	        system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $ENV{FEDORA_DS_DIR} -d$ENV{FEDORA_DS_LOGLEVEL} -i $ENV{FEDORA_DS_PIDFILE}> $ENV{LDAPDIR}/logs 2>&1 &");
+	        system("$env_vars->{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $env_vars->{FEDORA_DS_DIR} -d$env_vars->{FEDORA_DS_LOGLEVEL} -i $env_vars->{FEDORA_DS_PIDFILE}> $env_vars->{LDAPDIR}/logs 2>&1 &");
 	} else {
 		my $oldpath = $ENV{PATH};
 		$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
-		system("slapd -d$ENV{OPENLDAP_LOGLEVEL} -f $conf -h $uri > $ENV{LDAPDIR}/logs 2>&1 &");
+		system("slapd -d$env_vars->{OPENLDAP_LOGLEVEL} -f $conf -h $uri > $env_vars->{LDAPDIR}/logs 2>&1 &");
 		$ENV{PATH} = $oldpath;
 	}
 	while (system("$self->{bindir}/ldbsearch -H $uri -s base -b \"\" supportedLDAPVersion > /dev/null") != 0) {
@@ -51,8 +51,8 @@ sub slapd_stop($$)
 	if (defined($envvars->{FEDORA_DS_PREFIX})) {
 		system("$envvars->{LDAPDIR}/slapd-samba4/stop-slapd");
 	} else {
-		open(IN, "<$envvars->{PIDDIR}/slapd.pid") or 
-			die("unable to open slapd pid file");
+		open(IN, "<$envvars->{OPENLDAP_PIDFILE}") or 
+			die("unable to open slapd pid file: $envvars->{OPENLDAP_PIDFILE}");
 		kill 9, <IN>;
 		close(IN);
 	}
@@ -69,7 +69,7 @@ sub check_or_start($$$)
 			die("couldn't start slapd");
 
 		print "LDAP PROVISIONING...";
-		$self->provision_ldap();
+		$self->provision_ldap($env_vars);
 	}
 
 	SocketWrapper::set_default_iface(1);
@@ -152,11 +152,11 @@ sub provision($$)
 	return \%ret;
 }
 
-sub provision_ldap($)
+sub provision_ldap($$)
 {
-	my ($self) = @_;
-    system("$self->{bindir}/smbscript $self->{setupdir}/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAP_URI}") and
-		die("LDAP PROVISIONING failed: $self->{bindir}/smbscript $self->{setupdir}/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAP_URI}");
+	my ($self, $envvars) = @_;
+    system("$self->{bindir}/smbscript $self->{setupdir}/provision $envvars->{PROVISION_OPTIONS} \"$envvars->{PROVISION_ACI}\" --ldap-backend=$envvars->{LDAP_URI}") and
+		die("LDAP PROVISIONING failed: $self->{bindir}/smbscript $self->{setupdir}/provision $envvars->{PROVISION_OPTIONS} \"$envvars->{PROVISION_ACI}\" --ldap-backend=$envvars->{LDAP_URI}");
 }
 
 sub teardown_env($$)
diff --git a/source4/script/tests/mk-openldap.sh b/source4/script/tests/mk-openldap.sh
index a70db73c74..1eb8b66583 100755
--- a/source4/script/tests/mk-openldap.sh
+++ b/source4/script/tests/mk-openldap.sh
@@ -2,13 +2,15 @@ SLAPD_CONF=$LDAPDIR/slapd.conf
 export SLAPD_CONF
 
 echo "OPENLDAP_LOGLEVEL=0"
+OPENLDAP_PIDFILE=$PIDDIR/slapd.pid
+echo "OPENLDAP_PIDFILE=$OPENLDAP_PIDFILE"
 
 cat >$SLAPD_CONF <<EOF
 loglevel 0
 
 include $LDAPDIR/ad.schema
 
-pidfile		$PIDDIR/slapd.pid
+pidfile		$OPENLDAP_PIDFILE
 argsfile	$LDAPDIR/slapd.args
 sasl-realm $DNSNAME
 access to * by * write
-- 
cgit