#9 Enable interval feature of DNA plugin (resolves: rhbz#1962671)
Merged 5 months ago by mreynolds. Opened 5 months ago by cheimes.
rpms/ cheimes/389-ds-base bz1962671  into  rawhide

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

file modified
+5 -1
@@ -47,7 +47,7 @@ 

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

  

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

  %endif

  

  %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

  - Rebuild for ICU 69

  

no initial comment

Pull-Request has been merged by mreynolds

5 months ago