Remove our copy of the DNA plugin and use the one that comes with DS.

The DS plugin does config checking when adding new entries online so
we are dropping the Posix subtree.

daemons/configure.ac

@@ -260,7 +260,6 @@ AC_CONFIG_FILES([
     Makefile
     ipa-kpasswd/Makefile
     ipa-slapi-plugins/Makefile
-    ipa-slapi-plugins/dna/Makefile
     ipa-slapi-plugins/ipa-memberof/Makefile
     ipa-slapi-plugins/ipa-pwd-extop/Makefile
     ipa-slapi-plugins/ipa-winsync/Makefile

daemons/ipa-slapi-plugins/Makefile.am

@@ -3,7 +3,6 @@ NULL =
 SUBDIRS =			\
 	ipa-pwd-extop		\
 	ipa-memberof		\
-	dna			\
 	ipa-winsync		\
 	$(NULL)
 

daemons/ipa-slapi-plugins/dna/Makefile.am

@@ -1,42 +0,0 @@
-NULL =
-
-INCLUDES =							\
-	-I.							\
-	-I$(srcdir)						\
-	-DPREFIX=\""$(prefix)"\" 				\
-	-DBINDIR=\""$(bindir)"\"				\
-	-DLIBDIR=\""$(libdir)"\" 				\
-	-DLIBEXECDIR=\""$(libexecdir)"\"			\
-	-DDATADIR=\""$(datadir)"\"				\
-	$(MOZLDAP_CFLAGS)					\
-	$(KRB5_CFLAGS)						\
-	$(WARN_CFLAGS)						\
-	$(NULL)
-
-plugindir = $(libdir)/dirsrv/plugins
-plugin_LTLIBRARIES = 			\
-	libipa-dna-plugin.la		\
-	$(NULL)
-
-libipa_dna_plugin_la_SOURCES = 		\
-	dna.c				\
-	$(NULL)
-
-libipa_dna_plugin_la_LDFLAGS = -avoid-version
-
-libipa_dna_plugin_la_LIBADD = 		\
-	$(MOZLDAP_LIBS)			\
-	$(NULL)
-
-appdir = $(IPA_DATA_DIR)
-app_DATA =			\
-	dna-conf.ldif		\
-	$(NULL)
-
-EXTRA_DIST =			\
-	$(app_DATA)		\
-	$(NULL)
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in

daemons/ipa-slapi-plugins/dna/dna-conf.ldif

@@ -1,14 +0,0 @@
-dn: cn=ipa-dna,cn=plugins,cn=config
-changetype: add
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: ipa-dna
-nsslapd-pluginpath: libipa-dna-plugin
-nsslapd-plugininitfunc: ipa_dna_init
-nsslapd-plugintype: preoperation
-nsslapd-pluginenabled: on
-nsslapd-pluginid: ipa-dna
-nsslapd-pluginversion: 1.0
-nsslapd-pluginvendor: Red Hat
-nsslapd-plugindescription: IPA Distributed numeric assignment plugin

install/share/Makefile.am

@@ -17,6 +17,7 @@ app_DATA =				\
 	bind.named.conf.template	\
 	bind.zone.db.template		\
 	certmap.conf.template		\
+	dna-conf.ldif			\
 	kdc.conf.template		\
 	krb5.conf.template		\
 	krb5.ini.template		\

install/share/bootstrap-template.ldif

@@ -115,6 +115,8 @@ dn: cn=ipausers,cn=groups,cn=accounts,$SUFFIX
 changetype: add
 objectClass: top
 objectClass: groupofnames
+objectClass: nestedGroup
+objectClass: ipaUserGroup
 objectClass: posixGroup
 gidNumber: 1002
 description: Default group for all users

install/share/dna-posix.ldif

@@ -1,19 +1,10 @@
-# add container for posix configuration
-
-dn: cn=Posix,cn=ipa-dna,cn=plugins,cn=config
-changetype: add
-objectclass: top
-objectclass: nsContainer
-objectclass: extensibleObject
-cn: Posix
-
 # add plugin configuration for posix users
 
-dn: cn=Accounts,cn=Posix,cn=ipa-dna,cn=plugins,cn=config
+dn: cn=Posix Accounts,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config
 changetype: add
 objectclass: top
 objectclass: extensibleObject
-cn: Accounts
+cn: Posix Accounts
 dnaType: uidNumber
 dnaNextValue: 1100
 dnaInterval: 1
@@ -24,11 +15,11 @@ dnaScope: $SUFFIX
 
 # add plugin configuration for posix groups
 
-dn: cn=Groups,cn=Posix,cn=ipa-dna,cn=plugins,cn=config
+dn: cn=Posix Groups,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config
 changetype: add
 objectclass: top
 objectclass: extensibleObject
-cn: Groups
+cn: Posix Groups
 dnaType: gidNumber
 dnaNextValue: 1100
 dnaInterval: 1

ipa.spec.in

@@ -225,7 +225,6 @@ make install DESTDIR=%{buildroot}
 # these files
 rm %{buildroot}/%{plugin_dir}/libipa_pwd_extop.la
 rm %{buildroot}/%{plugin_dir}/libipa-memberof-plugin.la
-rm %{buildroot}/%{plugin_dir}/libipa-dna-plugin.la
 rm %{buildroot}/%{plugin_dir}/libipa_winsync.la
 
 # Some user-modifiable HTML files are provided. Move these to /etc
@@ -351,7 +350,6 @@ fi
 %{_usr}/share/ipa/updates/*
 %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
 %attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so
-%attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so
 %attr(755,root,root) %{plugin_dir}/libipa_winsync.so
 %dir %{_localstatedir}/lib/ipa
 %attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
@@ -425,7 +423,10 @@ fi
 %endif
 
 %changelog
-* Thu Mar  4 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-2
+* Thu Mar  5 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-3
+- Remove the IPA DNA plugin, use the DS one
+
+* Wed Mar  4 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-2
 - Build radius separately
 - Fix a few minor issues