Skip to content

Commit

Permalink
Ticket 49038 - Remove legacy replication
Browse files Browse the repository at this point in the history
Description:  Removed all things legacy replication.  Also added a upgrade script
              to remove the plugin on upgrade.

https://pagure.io/389-ds-base/issue/49038

Reviewed by: firstyear, tbordaz, and lkrispenz (Thanks!!!)
  • Loading branch information
mreynolds389 committed Jul 17, 2017
1 parent c8370b8 commit b95f5f2
Show file tree
Hide file tree
Showing 55 changed files with 133 additions and 3,876 deletions.
17 changes: 1 addition & 16 deletions Makefile.am
Expand Up @@ -417,21 +417,18 @@ dist_noinst_HEADERS = \
ldap/servers/plugins/uiduniq/plugin-utils.h \
ldap/servers/plugins/memberof/memberof.h \
ldap/servers/plugins/replication/cl5_api.h \
ldap/servers/plugins/replication/cl4_api.h \
ldap/servers/plugins/replication/llist.h \
ldap/servers/plugins/replication/repl_shared.h \
ldap/servers/plugins/replication/csnpl.h \
ldap/servers/plugins/replication/cl5.h \
ldap/servers/plugins/replication/repl-session-plugin.h \
ldap/servers/plugins/replication/repl.h \
ldap/servers/plugins/replication/windows_prot_private.h \
ldap/servers/plugins/replication/repl_helper.h \
ldap/servers/plugins/replication/repl_objset.h \
ldap/servers/plugins/replication/repl5.h \
ldap/servers/plugins/replication/cl5_test.h \
ldap/servers/plugins/replication/repl5_ruv.h \
ldap/servers/plugins/replication/cl5_clcache.h \
ldap/servers/plugins/replication/cl4.h \
ldap/servers/plugins/replication/cl_crypt.h \
ldap/servers/plugins/replication/urp.h \
ldap/servers/plugins/replication/winsync-plugin.h \
Expand Down Expand Up @@ -943,6 +940,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \
ldap/admin/src/scripts/50telexnumbersyntaxplugin.ldif \
ldap/admin/src/scripts/50guidesyntaxplugin.ldif \
ldap/admin/src/scripts/50targetuniqueid.ldif \
ldap/admin/src/scripts/50removeLegacyReplication.ldif \
ldap/ldif/50replication-plugins.ldif \
ldap/admin/src/scripts/50linkedattrsplugin.ldif \
$(POSIX_WINSYNC_PLUGIN_LDIF) \
Expand Down Expand Up @@ -1653,27 +1651,14 @@ libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \
ldap/servers/plugins/replication/cl5_init.c \
ldap/servers/plugins/replication/cl_crypt.c \
ldap/servers/plugins/replication/csnpl.c \
ldap/servers/plugins/replication/legacy_consumer.c \
ldap/servers/plugins/replication/llist.c \
ldap/servers/plugins/replication/repl_add.c \
ldap/servers/plugins/replication/repl_bind.c \
ldap/servers/plugins/replication/repl_compare.c \
ldap/servers/plugins/replication/repl_connext.c \
ldap/servers/plugins/replication/repl_controls.c \
ldap/servers/plugins/replication/repl_delete.c \
ldap/servers/plugins/replication/repl_entry.c \
ldap/servers/plugins/replication/repl_ext.c \
ldap/servers/plugins/replication/repl_extop.c \
ldap/servers/plugins/replication/repl_globals.c \
ldap/servers/plugins/replication/repl_init.c \
ldap/servers/plugins/replication/repl_modify.c \
ldap/servers/plugins/replication/repl_modrdn.c \
ldap/servers/plugins/replication/repl_monitor.c \
ldap/servers/plugins/replication/repl_objset.c \
ldap/servers/plugins/replication/repl_opext.c \
ldap/servers/plugins/replication/repl_ops.c \
ldap/servers/plugins/replication/repl_rootdse.c \
ldap/servers/plugins/replication/repl_search.c \
ldap/servers/plugins/replication/repl_session_plugin.c \
ldap/servers/plugins/replication/repl5_agmt.c \
ldap/servers/plugins/replication/repl5_agmtlist.c \
Expand Down
2 changes: 2 additions & 0 deletions ldap/admin/src/scripts/50removeLegacyReplication.ldif
@@ -0,0 +1,2 @@
dn: cn=Legacy Replication Plugin,cn=plugins,cn=config
changetype: delete
13 changes: 0 additions & 13 deletions ldap/ldif/50replication-plugins.ldif
@@ -1,16 +1,3 @@
dn: cn=Legacy Replication Plugin,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
objectclass: extensibleObject
cn: Legacy Replication Plugin
nsslapd-pluginpath: libreplication-plugin
nsslapd-plugininitfunc: replication_legacy_plugin_init
nsslapd-plugintype: object
nsslapd-pluginenabled: on
nsslapd-plugin-depends-on-type: database
nsslapd-plugin-depends-on-named: Multimaster Replication Plugin
nsslapd-plugin-depends-on-named: Class of Service

dn: cn=Multimaster Replication Plugin,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
Expand Down
2 changes: 1 addition & 1 deletion ldap/schema/01core389.ldif
Expand Up @@ -71,7 +71,7 @@ attributeTypes: ( 2.16.840.1.113730.3.1.686 NAME 'nsds5replicaLastUpdateEnd' DES
attributeTypes: ( 2.16.840.1.113730.3.1.687 NAME 'nsds5replicaChangesSentSinceStartup' DESC 'Netscape defined attribute type' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE NO-USER-MODIFICATION X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.688 NAME 'nsds5replicaLastUpdateStatus' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE NO-USER-MODIFICATION X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.689 NAME 'nsds5replicaUpdateInProgress' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE NO-USER-MODIFICATION X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.802 NAME 'nsds5ReplicaLegacyConsumer' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.802 NAME 'nsds5ReplicaLegacyConsumer' DESC 'Netscape defined attribute type - OBSOLETE' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2132 NAME 'nsds5ReplicaEnabled' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.804 NAME 'nsSchemaCSN' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.805 NAME 'nsds5replicaTimeout' DESC 'Netscape defined attribute type' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
Expand Down
73 changes: 0 additions & 73 deletions ldap/servers/plugins/replication/cl4.h

This file was deleted.

0 comments on commit b95f5f2

Please sign in to comment.