Fedora Info: [389-commits] [389-ds-base] 01/01: Ticket 49038

This is an automated email from the git hooks/post-receive script.

mreynolds pushed a commit to branch master
in repository 389-ds-base.

commit b95f5f283ebacd4cb451d017584d2bd48ff907a2
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Mon Jul 17 11:41:39 2017 -0400

Ticket 49038 - Remove legacy replication

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!!!)
---
Makefile.am | 17 +-
.../src/scripts/50removeLegacyReplication.ldif | 2 +
ldap/ldif/50replication-plugins.ldif | 13 -
ldap/schema/01core389.ldif | 2 +-
ldap/servers/plugins/replication/cl4.h | 73 --
ldap/servers/plugins/replication/cl4_api.c | 804 ---------------------
ldap/servers/plugins/replication/cl4_api.h | 75 --
ldap/servers/plugins/replication/cl4_init.c | 357 ---------
ldap/servers/plugins/replication/legacy_consumer.c | 723 ------------------
ldap/servers/plugins/replication/profile.c | 1 -
ldap/servers/plugins/replication/repl.h | 394 ----------
ldap/servers/plugins/replication/repl5.h | 120 ++-
.../plugins/replication/repl5_inc_protocol.c | 6 +-
ldap/servers/plugins/replication/repl5_init.c | 9 +-
.../servers/plugins/replication/repl5_mtnode_ext.c | 1 -
ldap/servers/plugins/replication/repl5_plugins.c | 126 +---
.../plugins/replication/repl5_protocol_util.c | 13 -
ldap/servers/plugins/replication/repl5_replica.c | 168 +----
.../plugins/replication/repl5_replica_config.c | 34 +-
.../plugins/replication/repl5_tot_protocol.c | 1 -
ldap/servers/plugins/replication/repl5_total.c | 1 -
ldap/servers/plugins/replication/repl_add.c | 38 -
ldap/servers/plugins/replication/repl_bind.c | 58 --
ldap/servers/plugins/replication/repl_compare.c | 48 --
ldap/servers/plugins/replication/repl_connext.c | 3 -
ldap/servers/plugins/replication/repl_controls.c | 1 -
ldap/servers/plugins/replication/repl_delete.c | 34 -
ldap/servers/plugins/replication/repl_entry.c | 46 --
ldap/servers/plugins/replication/repl_ext.c | 2 +-
ldap/servers/plugins/replication/repl_extop.c | 8 -
ldap/servers/plugins/replication/repl_globals.c | 3 +-
ldap/servers/plugins/replication/repl_init.c | 302 --------
ldap/servers/plugins/replication/repl_modify.c | 37 -
ldap/servers/plugins/replication/repl_modrdn.c | 36 -
ldap/servers/plugins/replication/repl_monitor.c | 73 --
ldap/servers/plugins/replication/repl_opext.c | 7 -
ldap/servers/plugins/replication/repl_ops.c | 188 -----
ldap/servers/plugins/replication/repl_rootdse.c | 92 ---
ldap/servers/plugins/replication/repl_search.c | 33 -
.../plugins/replication/repl_session_plugin.c | 1 -
ldap/servers/plugins/replication/repl_shared.h | 1 -
ldap/servers/plugins/replication/replutil.c | 1 -
ldap/servers/plugins/replication/urp.c | 1 -
.../plugins/replication/windows_inc_protocol.c | 1 -
ldap/servers/plugins/replication/windows_private.c | 1 -
.../plugins/replication/windows_tot_protocol.c | 2 -
ldap/servers/slapd/add.c | 13 +-
ldap/servers/slapd/mapping_tree.c | 1 -
ldap/servers/slapd/pblock.c | 9 +-
ldap/servers/slapd/plugin_acl.c | 6 +-
ldap/servers/slapd/search.c | 16 -
ldap/servers/slapd/slapi-plugin.h | 1 -
ldap/servers/slapd/slapi-private.h | 3 -
test/libslapd/pblock/pblock_accessors.txt | 1 -
test/libslapd/pblock/pblock_accessors_freq.txt | 2 -
55 files changed, 133 insertions(+), 3876 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f075a47..b2c736b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -417,13 +417,11 @@ 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 \
@@ -431,7 +429,6 @@ dist_noinst_HEADERS = \
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 \
@@ -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) \
@@ -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 \
diff --git a/ldap/admin/src/scripts/50removeLegacyReplication.ldif b/ldap/admin/src/scripts/50removeLegacyReplication.ldif
new file mode 100644
index 0000000..7c64a96
--- /dev/null
+++ b/ldap/admin/src/scripts/50removeLegacyReplication.ldif
@@ -0,0 +1,2 @@
+dn: cn=Legacy Replication Plugin,cn=plugins,cn=config
+changetype: delete
diff --git a/ldap/ldif/50replication-plugins.ldif b/ldap/ldif/50replication-plugins.ldif
index 71afbea..2a978be 100644
--- a/ldap/ldif/50replication-plugins.ldif
+++ b/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
diff --git a/ldap/schema/01core389.ldif b/ldap/schema/01core389.ldif
index 836b953..2464952 100644
--- a/ldap/schema/01core389.ldif
+++ b/ldap/schema/01core389.ldif
@@ -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' )
diff --git a/ldap/servers/plugins/replication/cl4.h b/ldap/servers/plugins/replication/cl4.h
deleted file mode 100644
index 65da4c8..0000000
--- a/ldap/servers/plugins/replication/cl4.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- *
- * License: GPL (version 3 or any later version).
- * See LICENSE for details.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-

Fedora Info

Monday, July 17, 2017

[389-commits] [389-ds-base] 01/01: Ticket 49038 - Remove legacy replication

No comments:

Post a Comment