From 70314dc25ca625913ff560ed2a014a1d1008209e Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: May 17 2018 10:58:28 +0000
Subject: Ticket 49665 - remove obsoleted upgrade scripts


Description:  Remove the recently added upgrade scripts as they are
              obsolete in 1.4.0.

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

Reviewed by: ?

---

diff --git a/Makefile.am b/Makefile.am
index 08438bb..314b93a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1071,8 +1071,6 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \
 	ldap/admin/src/scripts/50refintprecedence.ldif \
 	ldap/admin/src/scripts/50retroclprecedence.ldif \
 	ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif \
-	ldap/admin/src/scripts/50pbkdf2pwdstorageplugin.ldif \
-	ldap/admin/src/scripts/50cryptpwdstorageplugin.ldif \
 	ldap/admin/src/scripts/50contentsync.ldif \
 	ldap/admin/src/scripts/60upgradeschemafiles.pl \
 	ldap/admin/src/scripts/60upgradeconfigfiles.pl \
diff --git a/ldap/admin/src/scripts/50cryptpwdstorageplugin.ldif b/ldap/admin/src/scripts/50cryptpwdstorageplugin.ldif
deleted file mode 100644
index 0a4a507..0000000
--- a/ldap/admin/src/scripts/50cryptpwdstorageplugin.ldif
+++ /dev/null
@@ -1,38 +0,0 @@
-dn: cn=CRYPT-MD5,cn=Password Storage Schemes,cn=plugins,cn=config
-objectClass: top
-objectClass: nsSlapdPlugin
-cn: CRYPT-MD5
-nsslapd-pluginPath: libpwdstorage-plugin
-nsslapd-pluginInitfunc: crypt_md5_pwd_storage_scheme_init
-nsslapd-pluginType: pwdstoragescheme
-nsslapd-pluginEnabled: on
-nsslapd-pluginId: ID
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginDescription: DESC
-
-dn: cn=CRYPT-SHA256,cn=Password Storage Schemes,cn=plugins,cn=config
-objectClass: top
-objectClass: nsSlapdPlugin
-cn: CRYPT-SHA256
-nsslapd-pluginPath: libpwdstorage-plugin
-nsslapd-pluginInitfunc: crypt_sha256_pwd_storage_scheme_init
-nsslapd-pluginType: pwdstoragescheme
-nsslapd-pluginEnabled: on
-nsslapd-pluginId: ID
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginDescription: DESC
-
-dn: cn=CRYPT-SHA512,cn=Password Storage Schemes,cn=plugins,cn=config
-objectClass: top
-objectClass: nsSlapdPlugin
-cn: CRYPT-SHA512
-nsslapd-pluginPath: libpwdstorage-plugin
-nsslapd-pluginInitfunc: crypt_sha512_pwd_storage_scheme_init
-nsslapd-pluginType: pwdstoragescheme
-nsslapd-pluginEnabled: on
-nsslapd-pluginId: ID
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginDescription: DESC
diff --git a/ldap/admin/src/scripts/50pbkdf2pwdstorageplugin.ldif b/ldap/admin/src/scripts/50pbkdf2pwdstorageplugin.ldif
deleted file mode 100644
index 462d553..0000000
--- a/ldap/admin/src/scripts/50pbkdf2pwdstorageplugin.ldif
+++ /dev/null
@@ -1,12 +0,0 @@
-dn: cn=PBKDF2_SHA256,cn=Password Storage Schemes,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-cn: PBKDF2_SHA256
-nsslapd-pluginpath: libpwdstorage-plugin
-nsslapd-plugininitfunc: pbkdf2_sha256_pwd_storage_scheme_init
-nsslapd-plugintype: pwdstoragescheme
-nsslapd-pluginenabled: on
-nsslapd-pluginDescription: DESC
-nsslapd-pluginVersion: PACKAGE_VERSION
-nsslapd-pluginVendor: VENDOR
-nsslapd-pluginid: ID
diff --git a/ldap/servers/slapd/fedse.c b/ldap/servers/slapd/fedse.c
index 08e33c0..9d9f6b8 100644
--- a/ldap/servers/slapd/fedse.c
+++ b/ldap/servers/slapd/fedse.c
@@ -127,6 +127,33 @@ static const char *internal_entries[] =
         "nsslapd-plugininitfunc: pbkdf2_sha256_pwd_storage_scheme_init\n"
         "nsslapd-plugintype: pwdstoragescheme\n"
         "nsslapd-pluginenabled: on\n",
+
+        "dn: cn=CRYPT-MD5,cn=Password Storage Schemes,cn=plugins,cn=config\n"
+        "objectClass: top\n"
+        "objectClass: nsSlapdPlugin\n"
+        "cn: CRYPT-MD5\n"
+        "nsslapd-pluginPath: libpwdstorage-plugin\n"
+        "nsslapd-pluginInitfunc: crypt_md5_pwd_storage_scheme_init\n"
+        "nsslapd-pluginType: pwdstoragescheme\n"
+        "nsslapd-pluginEnabled: on\n",
+
+        "dn: cn=CRYPT-SHA256,cn=Password Storage Schemes,cn=plugins,cn=config\n"
+        "objectClass: top\n"
+        "objectClass: nsSlapdPlugin\n"
+        "cn: CRYPT-SHA256\n"
+        "nsslapd-pluginPath: libpwdstorage-plugin\n"
+        "nsslapd-pluginInitfunc: crypt_sha256_pwd_storage_scheme_init\n"
+        "nsslapd-pluginType: pwdstoragescheme\n"
+        "nsslapd-pluginEnabled: on\n",
+
+        "dn: cn=CRYPT-SHA512,cn=Password Storage Schemes,cn=plugins,cn=config\n"
+        "objectClass: top\n"
+        "objectClass: nsSlapdPlugin\n"
+        "cn: CRYPT-SHA512\n"
+        "nsslapd-pluginPath: libpwdstorage-plugin\n"
+        "nsslapd-pluginInitfunc: crypt_sha512_pwd_storage_scheme_init\n"
+        "nsslapd-pluginType: pwdstoragescheme\n"
+        "nsslapd-pluginEnabled: on\n",
 };
 
 static int NUM_INTERNAL_ENTRIES = sizeof(internal_entries) / sizeof(internal_entries[0]);