summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-10-09 17:07:03 -0400
committerRob Crittenden <rcritten@redhat.com>2009-10-12 09:37:38 -0400
commit342337a89330c4253b350cc06124aaa6747c5122 (patch)
treedfb8be8b83b4f06183e6e9bd20675764d32f28e7
parent416c2a894f6563284ac146745390f98763487f0a (diff)
downloadfreeipa-342337a89330c4253b350cc06124aaa6747c5122.tar.gz
freeipa-342337a89330c4253b350cc06124aaa6747c5122.tar.xz
freeipa-342337a89330c4253b350cc06124aaa6747c5122.zip
No longer use the IPA-specific memberof plugin. Use the DS-supplied one.
-rw-r--r--daemons/ipa-slapi-plugins/Makefile.am1
-rw-r--r--install/share/Makefile.am1
-rw-r--r--install/share/memberof-conf.ldif5
-rw-r--r--ipa.spec.in2
4 files changed, 6 insertions, 3 deletions
diff --git a/daemons/ipa-slapi-plugins/Makefile.am b/daemons/ipa-slapi-plugins/Makefile.am
index ac2d26879..f5c237439 100644
--- a/daemons/ipa-slapi-plugins/Makefile.am
+++ b/daemons/ipa-slapi-plugins/Makefile.am
@@ -3,7 +3,6 @@ NULL =
SUBDIRS = \
ipa-enrollment \
ipa-pwd-extop \
- ipa-memberof \
ipa-winsync \
$(NULL)
diff --git a/install/share/Makefile.am b/install/share/Makefile.am
index 4d2c28e0a..b74f99045 100644
--- a/install/share/Makefile.am
+++ b/install/share/Makefile.am
@@ -34,6 +34,7 @@ app_DATA = \
dna-posix.ldif \
master-entry.ldif \
memberof-task.ldif \
+ memberof-conf.ldif \
nis.uldif \
unique-attributes.ldif \
schema_compat.uldif \
diff --git a/install/share/memberof-conf.ldif b/install/share/memberof-conf.ldif
new file mode 100644
index 000000000..189e16ada
--- /dev/null
+++ b/install/share/memberof-conf.ldif
@@ -0,0 +1,5 @@
+dn: cn=MemberOf Plugin,cn=plugins,cn=config
+changetype: modify
+replace: nsslapd-pluginenabled
+nsslapd-pluginenabled: on
+
diff --git a/ipa.spec.in b/ipa.spec.in
index d1173b23e..f29356888 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -227,7 +227,6 @@ make install DESTDIR=%{buildroot}
# these files
rm %{buildroot}/%{plugin_dir}/libipa_pwd_extop.la
rm %{buildroot}/%{plugin_dir}/libipa_enrollment_extop.la
-rm %{buildroot}/%{plugin_dir}/libipa-memberof-plugin.la
rm %{buildroot}/%{plugin_dir}/libipa_winsync.la
# Some user-modifiable HTML files are provided. Move these to /etc
@@ -362,7 +361,6 @@ fi
%{_usr}/share/ipa/updates/*
%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
%attr(755,root,root) %{plugin_dir}/libipa_enrollment_extop.so
-%attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so
%attr(755,root,root) %{plugin_dir}/libipa_winsync.so
%dir %{_localstatedir}/lib/ipa
%attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore