sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r22167: This seems to get Fedora DS to run the tests again.

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2007-04-11 10:25:02 +00:00 committed by Gerald (Jerry) Carter
parent a95ce3c895
commit b893c63183
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/script/tests/Samba4.pm
View File

@ -27,7 +27,7 @@ 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_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 &");
system("$ENV{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}";
@ -48,7 +48,7 @@ sub slapd_start($$)
sub slapd_stop($$)
{
my ($self, $envvars) = @_;
if (defined($envvars->{FEDORA_DS_PREFIX})) {
if (defined($ENV{FEDORA_DS_PREFIX})) {
system("$envvars->{LDAPDIR}/slapd-samba4/stop-slapd");
} else {
open(IN, "<$envvars->{OPENLDAP_PIDFILE}") or