Enable interval feature of DNA plugin (resolves: rhbz#1962671)

This commit is contained in:
Christian Heimes 2021-05-20 15:31:42 +02:00
parent 7f1440cb1e
commit 7a744575fa
2 changed files with 25 additions and 1 deletions

View File

@ -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) {

View File

@ -47,7 +47,7 @@ ExcludeArch: i686
Summary: 389 Directory Server (base) Summary: 389 Directory Server (base)
Name: 389-ds-base Name: 389-ds-base
Version: 2.0.4 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) 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 URL: https://www.port389.org
Conflicts: selinux-policy-base < 3.9.8 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 Source0: https://releases.pagure.org/389-ds-base/%{name}-%{version}%{?prerel}.tar.bz2
Patch0: 0000-Issue-4765-database-suffix-on-2-0-4.patch 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 # 389-ds-git.sh should be used to generate the source tarball from git
Source1: %{name}-git.sh Source1: %{name}-git.sh
Source2: %{name}-devel.README Source2: %{name}-devel.README
@ -704,6 +705,9 @@ exit 0
%endif %endif
%changelog %changelog
* Thu May 20 2021 Christian Heimes <cheimes@redhat.com> - 2.0.4-4
- Enable interval feature of DNA plugin (resolves: rhbz#1962671)
* Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 2.0.4-3.2 * Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 2.0.4-3.2
- Rebuild for ICU 69 - Rebuild for ICU 69