From a08540a828dde2f2e1a8d157c38a9be85a5d2876 Mon Sep 17 00:00:00 2001
From: James Chapman <jachapma@redhat.com>
Date: Tue, 4 May 2021 15:48:10 +0100
Subject: [PATCH] Issue 4750 - Fix compiler warning in retrocl (#4751)

Description: An unused variable generates a compiler warning.

Fix description: Remove unused variable. Modify CI test to restart the test instance instead
		         of using dynamic plugins.

Fixes: https://github.com/389ds/389-ds-base/issues/4750

Relates: https://github.com/389ds/389-ds-base/issues/4701

Reviewed by: jchapma (One line commit rule)
---
 .../tests/suites/retrocl/basic_test.py        | 30 ++++++++-----------
 ldap/servers/plugins/retrocl/retrocl.c        |  1 -
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/dirsrvtests/tests/suites/retrocl/basic_test.py b/dirsrvtests/tests/suites/retrocl/basic_test.py
index 043d4d2579..543945fce2 100644
--- a/dirsrvtests/tests/suites/retrocl/basic_test.py
+++ b/dirsrvtests/tests/suites/retrocl/basic_test.py
@@ -60,13 +60,6 @@ def test_retrocl_exclude_attr_add(topology_st):
 
     st = topology_st.standalone
 
-    log.info('Enable dynamic plugins')
-    try:
-        st.config.set('nsslapd-dynamic-plugins', 'on')
-    except ldap.LDAPError as e:
-        ldap.error('Failed to enable dynamic plugins ' + e.args[0]['desc'])
-        assert False
-
     log.info('Configure retrocl plugin')
     rcl = RetroChangelogPlugin(st)
     rcl.disable()
@@ -131,8 +124,12 @@ def test_retrocl_exclude_attr_add(topology_st):
     disconnect_instance(inst)
     assert result is None
 
-    log.info("5s delay for retrocl plugin to restart")
-    time.sleep(5)
+    log.info('Restarting instance')
+    try:
+        st.restart()
+    except ldap.LDAPError as e:
+        ldap.error('Failed to restart instance ' + e.args[0]['desc'])
+        assert False
 
     log.info('Adding user2')
     try:
@@ -195,13 +192,6 @@ def test_retrocl_exclude_attr_mod(topology_st):
 
     st = topology_st.standalone
 
-    log.info('Enable dynamic plugins')
-    try:
-        st.config.set('nsslapd-dynamic-plugins', 'on')
-    except ldap.LDAPError as e:
-        ldap.error('Failed to enable dynamic plugins ' + e.args[0]['desc'])
-        assert False
-
     log.info('Configure retrocl plugin')
     rcl = RetroChangelogPlugin(st)
     rcl.disable()
@@ -266,8 +256,12 @@ def test_retrocl_exclude_attr_mod(topology_st):
     disconnect_instance(inst)
     assert result is None
 
-    log.info("5s delay for retrocl plugin to restart")
-    time.sleep(5)
+    log.info('Restarting instance')
+    try:
+        st.restart()
+    except ldap.LDAPError as e:
+        ldap.error('Failed to restart instance ' + e.args[0]['desc'])
+        assert False
 
     log.info('Modify user1 carLicense attribute')
     try:
diff --git a/ldap/servers/plugins/retrocl/retrocl.c b/ldap/servers/plugins/retrocl/retrocl.c
index f73c815281..e869b932ea 100644
--- a/ldap/servers/plugins/retrocl/retrocl.c
+++ b/ldap/servers/plugins/retrocl/retrocl.c
@@ -400,7 +400,6 @@ retrocl_start(Slapi_PBlock *pb)
 
         for (size_t i = 0; i < num_vals; i++) {
             char *value = values[i];
-
             char *pos = strchr(value, ':');
             if (pos == NULL) {
                 retrocl_exclude_attrs[i] = slapi_ch_strdup(value);