Author: abartlet Date: 2007-04-23 21:56:23 +0000 (Mon, 23 Apr 2007) New Revision: 22494
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22494 Log: Skip subSchema again, but we will need to remap this objectClass. Make the Fedora DS backend test again. Andrew Bartlett Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0 branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 Changeset: Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm =================================================================== --- branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-04-23 21:40:54 UTC (rev 22493) +++ branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-04-23 21:56:23 UTC (rev 22494) @@ -26,7 +26,7 @@ my ($slapd_conf, $uri, $logs) = @_; my $oldpath = $ENV{PATH}; $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; - system("slapd -d0 -f $slapd_conf -h $uri > $logs 2>&1 &"); + system("slapd -d -f $slapd_conf -h $uri > $logs 2>&1 &"); $ENV{PATH} = $oldpath; } @@ -66,6 +66,7 @@ kill 9, <IN>; close(IN); } + return 1; } sub check_or_start($$$) @@ -645,8 +646,6 @@ SOCKET_WRAPPER_DEFAULT_IFACE => $swiface }; - $ret->{PROVISION_OPTIONS} = join(' ', @provision_options); - if (defined($self->{ldap})) { if ($self->{ldap} eq "openldap") { @@ -659,12 +658,16 @@ $self->slapd_start($ret) or die("couldn't start slapd"); + $ret->{PROVISION_OPTIONS} = join(' ', @provision_options); + print "LDAP PROVISIONING..."; $self->provision_ldap($ret); $self->slapd_stop($ret) or die("couldn't stop slapd"); - } + } else { + $ret->{PROVISION_OPTIONS} = join(' ', @provision_options); + } return $ret; } Modified: branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0 =================================================================== --- branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0 2007-04-23 21:40:54 UTC (rev 22493) +++ branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0 2007-04-23 21:56:23 UTC (rev 22494) @@ -15,7 +15,6 @@ #This shouldn't make it to the ldap server sambaPassword #Skip ObjectClasses -# #MiddleName has a conflicting OID 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1 #defaultGroup has a conflicting OID Modified: branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 =================================================================== --- branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2007-04-23 21:40:54 UTC (rev 22493) +++ branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2007-04-23 21:56:23 UTC (rev 22494) @@ -19,7 +19,7 @@ #This shouldn't make it to the ldap server sambaPassword #Skip ObjectClasses -#subSchema +subSchema #MiddleName has a conflicting OID 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1 #defaultGroup has a conflicting OID
