diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-04-23 21:56:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:33 -0500 |
| commit | f1851e7abc3d019253f679deed31c6e948127037 (patch) | |
| tree | 0f883ba2b1eb54766b6a498be9f5de0039c2f09c /source4 | |
| parent | c58042c90e31fa77b91bd065f3b8e5db6307ed51 (diff) | |
| download | samba-f1851e7abc3d019253f679deed31c6e948127037.tar.gz samba-f1851e7abc3d019253f679deed31c6e948127037.tar.bz2 samba-f1851e7abc3d019253f679deed31c6e948127037.zip | |
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)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/script/tests/Samba4.pm | 11 | ||||
| -rw-r--r-- | source4/setup/schema-map-fedora-ds-1.0 | 1 | ||||
| -rw-r--r-- | source4/setup/schema-map-openldap-2.3 | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm index 8bb7a96bc3..e9166cef09 100644 --- 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 f3387130b6..7419a8d7b8 100644 --- 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 21867140c5..bedf402a9f 100644 --- 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 |