From 120e818cc2d2948350d98fac2a77dc785c6d6613 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Fri, 12 May 2017 12:19:13 -0400
Subject: [PATCH] Ticket 49165 - Fix compiler warnings

Description: Fix compiler warnings

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

Reviewd by: mreynolds(one line commit rule)
---
 ldap/servers/slapd/back-ldbm/dblayer.c | 4 ++--
 ldap/servers/slapd/main.c              | 9 +--------
 ldap/servers/slapd/task.c              | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index 4fde295..0e81643 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -1267,7 +1267,7 @@ dblayer_start(struct ldbminfo *li, int dbmode)
     /* li->li_directory comes from nsslapd-directory */
     /* dblayer_home_directory is freed in dblayer_post_close.
      * li_directory needs to live beyond dblayer. */
-    slapi_ch_free(&priv->dblayer_home_directory);
+    slapi_ch_free_string(&priv->dblayer_home_directory);
     priv->dblayer_home_directory = slapi_ch_strdup(li->li_directory); 
     priv->dblayer_cachesize = li->li_dbcachesize;
     priv->dblayer_lock_config = li->li_dblock;
@@ -7002,7 +7002,7 @@ dblayer_restore_file_update(struct ldbminfo *li, char *directory)
     PRFileDesc *prfd;
     char *fname = dblayer_restore_file_name(li);
     dblayer_file_open(fname, PR_RDWR, li->li_mode, &prfd);
-    slapi_ch_free(&fname);
+    slapi_ch_free_string(&fname);
     if (prfd) {
         char *line = slapi_ch_smprintf("restore of %s succeeded", directory);
         slapi_write_buffer(prfd, line, strlen(line));
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 7d27e83..85e4c6f 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -185,7 +185,7 @@ main_create_ns(ns_thrpool_t **tp_in) {
     tp_config.max_threads = maxthreads;
     tp_config.stacksize = SLAPD_DEFAULT_THREAD_STACKSIZE;
     /* Highly likely that we need to re-write logging to be controlled by NS here. */
-    /* tp_config.log_fct = nunc_stans_logging; */
+    tp_config.log_fct = nunc_stans_logging;
 #ifdef DEBUG
     tp_config.log_fct = ns_printf_logger;
 #endif
@@ -2037,7 +2037,6 @@ slapd_exemode_ldif2db(void)
 {
     int return_value= 0;
     struct slapdplugin *plugin;
-    slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
 
     if ( ldif_file == NULL ) {
         slapi_log_err(SLAPI_LOG_ERR, "slapd_exemode_ldif2db",
@@ -2160,7 +2159,6 @@ slapd_exemode_db2ldif(int argc, char** argv)
 {
     int return_value= 0;
     struct slapdplugin *plugin;
-    slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
     char *my_ldiffile;
     char **instp;
 
@@ -2376,7 +2374,6 @@ static int slapd_exemode_db2index(void)
 {
     int return_value= 0;
     struct slapdplugin *plugin;
-    slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
 
     mapping_tree_init();
 
@@ -2465,7 +2462,6 @@ slapd_exemode_db2archive(void)
 {
 	int return_value= 0;
 	struct slapdplugin *backend_plugin;
-	slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
 	
 	if ((backend_plugin = plugin_get_by_name("ldbm database")) == NULL) {
 		slapi_log_err(SLAPI_LOG_CRIT, "slapd_exemode_db2archive",
@@ -2512,7 +2508,6 @@ slapd_exemode_archive2db(void)
 {
 	int return_value= 0;
 	struct slapdplugin *backend_plugin;
-	slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
 	
 	if ((backend_plugin = plugin_get_by_name("ldbm database")) == NULL) {
 		slapi_log_err(SLAPI_LOG_CRIT, "slapd_exemode_archive2db",
@@ -2564,7 +2559,6 @@ slapd_exemode_upgradedb(void)
 {
     int return_value= 0;
     struct slapdplugin *backend_plugin;
-    slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
 
     if ( archive_name == NULL ) {
         slapi_log_err(SLAPI_LOG_ERR, "slapd_exemode_upgradedb",
@@ -2629,7 +2623,6 @@ slapd_exemode_upgradednformat(void)
 {
     int rc = -1; /* error, by default */
     struct slapdplugin *backend_plugin;
-    slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
 
     if ( archive_name == NULL ) {
         slapi_log_err(SLAPI_LOG_ERR, "slapd_exemode_upgradednformat",
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index afaaebd..02f8b2e 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -911,7 +911,7 @@ static int task_import_add(Slapi_PBlock *pb __attribute__((unused)),
 
             if (counter == 1){
                 instance_name = slapi_ch_strdup(*instances);
-                nameFrombe_name = instance_name;
+                nameFrombe_name = (char *)instance_name;
                 charray_free(instances);
             } else if (counter == 0) {
                 slapi_log_err(SLAPI_LOG_ERR,
-- 
2.9.3