From 7a744575fa57a6b18c4742879dcd3dcb92bff18d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 20 May 2021 15:31:42 +0200 Subject: [PATCH] Enable interval feature of DNA plugin (resolves: rhbz#1962671) --- 0001-dna_enable_interval.patch | 20 ++++++++++++++++++++ 389-ds-base.spec | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 0001-dna_enable_interval.patch diff --git a/0001-dna_enable_interval.patch b/0001-dna_enable_interval.patch new file mode 100644 index 0000000..5bef2ee --- /dev/null +++ b/0001-dna_enable_interval.patch @@ -0,0 +1,20 @@ +diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c +index bf6b74a99..928a3f54a 100644 +--- a/ldap/servers/plugins/dna/dna.c ++++ b/ldap/servers/plugins/dna/dna.c +@@ -1023,7 +1023,6 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry *e, int apply) + /* Set the default interval to 1 */ + entry->interval = 1; + +-#ifdef DNA_ENABLE_INTERVAL + value = slapi_entry_attr_get_charptr(e, DNA_INTERVAL); + if (value) { + entry->interval = strtoull(value, 0, 0); +@@ -1032,7 +1031,6 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry *e, int apply) + + slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, + "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_INTERVAL, entry->interval); +-#endif + + value = slapi_entry_attr_get_charptr(e, DNA_GENERATE); + if (value) { diff --git a/389-ds-base.spec b/389-ds-base.spec index 4521777..6eba10f 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -47,7 +47,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base Version: 2.0.4 -Release: %{?relprefix}3%{?prerel}%{?dist}.2 +Release: %{?relprefix}4%{?prerel}%{?dist} License: GPLv3+ and MIT and (ASL 2.0 or MIT) and (ASL 2.0 or Boost) and MPLv2.0 and ASL 2.0 and BSD and (ASL 2.0 with exceptions or ASL 2.0 or MIT) and (Unlicense or MIT) URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 @@ -255,6 +255,7 @@ Obsoletes: %{name} <= 1.3.5.4 Source0: https://releases.pagure.org/389-ds-base/%{name}-%{version}%{?prerel}.tar.bz2 Patch0: 0000-Issue-4765-database-suffix-on-2-0-4.patch +Patch1: 0001-dna_enable_interval.patch # 389-ds-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh Source2: %{name}-devel.README @@ -704,6 +705,9 @@ exit 0 %endif %changelog +* Thu May 20 2021 Christian Heimes - 2.0.4-4 +- Enable interval feature of DNA plugin (resolves: rhbz#1962671) + * Wed May 19 2021 Pete Walter - 2.0.4-3.2 - Rebuild for ICU 69