UTIL: Use sss_vdebug_fn for callbacks

Reviewed-by: Pavel Březina <pbrezina@redhat.com>

2 files changed, 5 insertions, 22 deletions

diff --git a/src/util/debug.c b/src/util/debug.c
index 3dcfbf00..0545b90d 100644
--- a/src/util/debug.c
+++ b/src/util/debug.c
@@ -285,8 +285,6 @@ void ldb_debug_messages(void *context, enum ldb_debug_level level,
                         const char *fmt, va_list ap)
 {
     int loglevel = SSSDBG_UNRESOLVED;
-    int ret;
-    char * message = NULL;
 
     switch(level) {
     case LDB_DEBUG_FATAL:
@@ -303,16 +301,9 @@ void ldb_debug_messages(void *context, enum ldb_debug_level level,
         break;
     }
 
-    ret = vasprintf(&message, fmt, ap);
-    if (ret < 0) {
-        /* ENOMEM */
-        return;
+    if (DEBUG_IS_SET(loglevel)) {
+        sss_vdebug_fn(__FILE__, __LINE__, "ldb", loglevel, fmt, ap);
     }
-
-    if (DEBUG_IS_SET(loglevel))
-        sss_debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message);
-
-    free(message);
 }
 
 /* In cases SSSD used to run as the root user, but runs as the SSSD user now,
diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c
index 4fb9df58..7f746491 100644
--- a/src/util/sss_semanage.c
+++ b/src/util/sss_semanage.c
@@ -39,8 +39,6 @@ static void sss_semanage_error_callback(void *varg,
                                         const char *fmt, ...)
 {
     int level = SSSDBG_INVALID;
-    int ret;
-    char * message = NULL;
     va_list ap;
 
     switch (semanage_msg_get_level(handle)) {
@@ -56,16 +54,10 @@ static void sss_semanage_error_callback(void *varg,
     }
 
     va_start(ap, fmt);
-    ret = vasprintf(&message, fmt, ap);
-    va_end(ap);
-    if (ret < 0) {
-        /* ENOMEM */
-        return;
+    if (DEBUG_IS_SET(level)) {
+        sss_vdebug_fn(__FILE__, __LINE__, "libsemanage", level, fmt, ap);
     }
-
-    if (DEBUG_IS_SET(level))
-        sss_debug_fn(__FILE__, __LINE__, "libsemanage", level, "%s\n", message);
-    free(message);
+    va_end(ap);
 }
 
 static void sss_semanage_close(semanage_handle_t *handle)