r22494: Skip subSchema again, but we will need to remap this objectClass.

Make the Fedora DS backend test again.

Andrew Bartlett
(This used to be commit 65327a0e4d61e2c9813720f04fe24ffc5c49278b)

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 8bb7a96bc3db9437c14cff897658794127692daa..e9166cef09b6fe2979f9695506d3c1c8ee6e69a9 100644 (file)
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -26,7 +26,7 @@ sub openldap_start($$$) {
         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 @@ sub slapd_stop($$)
                kill 9, <IN>;
                close(IN);
        }
+       return 1;
 }
 
 sub check_or_start($$$) 
@@ -645,8 +646,6 @@ sub provision($$$$$)
                SOCKET_WRAPPER_DEFAULT_IFACE => $swiface
        };
 
-       $ret->{PROVISION_OPTIONS} = join(' ', @provision_options);
-
        if (defined($self->{ldap})) {
 
                if ($self->{ldap} eq "openldap") {
@@ -659,12 +658,16 @@ sub provision($$$$$)
                $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; 
 }
 

diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0
index f3387130b6d7b1d9a136f0200038566377fb2638..7419a8d7b887c59fb9190d35bbc77a8a614d789b 100644 (file)
--- a/source4/setup/schema-map-fedora-ds-1.0
+++ b/source4/setup/schema-map-fedora-ds-1.0
@@ -15,7 +15,6 @@ top
 #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

diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3
index 21867140c529e47a0f801ba1dc911f81a35f72e8..bedf402a9fe262e1457e99513fa1072417727bd1 100644 (file)
--- a/source4/setup/schema-map-openldap-2.3
+++ b/source4/setup/schema-map-openldap-2.3
@@ -19,7 +19,7 @@ top
 #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