Revert "Fixing serious memory allocation bug in sbus_message_handler."

This reverts commit 13421cbe0af4343f9d110600755ffa756690b282.

Conflicts:

	server/infopipe/infopipe.c
	server/infopipe/infopipe.h

While this solution fixed the contingent memory problem it introduced
other problems in handling asynchronous replies.
Reverting in preparation for a different way to solve it.

Conflicts have been taken care of.

2 files changed, 11 insertions, 29 deletions

diff --git a/server/sbus/sssd_dbus.h b/server/sbus/sssd_dbus.h
index 20165ffbb..5fec9c80a 100644
--- a/server/sbus/sssd_dbus.h
+++ b/server/sbus/sssd_dbus.h
@@ -27,8 +27,7 @@ struct sbus_srv_ctx;
 
 #include "dbus/dbus.h"
 
-struct sbus_message_ctx;
-typedef int (*sbus_msg_handler_fn)(DBusMessage *, struct sbus_message_ctx *);
+typedef int (*sbus_msg_handler_fn)(DBusMessage *, void *, DBusMessage **);
 
 /*
  * sbus_conn_destructor_fn
@@ -73,11 +72,6 @@ struct sbus_message_handler_ctx {
     char *introspection_xml;
 };
 
-struct sbus_message_ctx {
-    struct sbus_message_handler_ctx *mh_ctx;
-    DBusMessage *reply_message;
-};
-
 /* Server Functions */
 int sbus_new_server(TALLOC_CTX *mem_ctx,
                     struct event_context *ev, struct sbus_method_ctx *ctx,
diff --git a/server/sbus/sssd_dbus_connection.c b/server/sbus/sssd_dbus_connection.c
index 186df3563..d02dc6c85 100644
--- a/server/sbus/sssd_dbus_connection.c
+++ b/server/sbus/sssd_dbus_connection.c
@@ -483,7 +483,7 @@ DBusHandlerResult sbus_message_handler(DBusConnection *conn,
     const char *method;
     const char *path;
     const char *msg_interface;
-    struct sbus_message_ctx *reply = NULL;
+    DBusMessage *reply = NULL;
     int i, ret;
     int found;
 
@@ -503,22 +503,14 @@ DBusHandlerResult sbus_message_handler(DBusConnection *conn,
     if (strcmp(path, ctx->method_ctx->path) != 0)
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-    reply = talloc_zero(ctx, struct sbus_message_ctx);
-    if (!reply) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    reply->mh_ctx = ctx;
-    reply->reply_message = NULL;
-
     /* Validate the method interface */
     if (strcmp(msg_interface, ctx->method_ctx->interface) == 0) {
         found = 0;
         for (i = 0; ctx->method_ctx->methods[i].method != NULL; i++) {
             if (strcmp(method, ctx->method_ctx->methods[i].method) == 0) {
                 found = 1;
-                ret = ctx->method_ctx->methods[i].fn(message, reply);
-                if (ret != EOK) {
-                    talloc_free(reply);
-                    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                }
+                ret = ctx->method_ctx->methods[i].fn(message, ctx, &reply);
+                if (ret != EOK) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
                 break;
             }
         }
@@ -526,7 +518,7 @@ DBusHandlerResult sbus_message_handler(DBusConnection *conn,
         if (!found) {
             /* Reply DBUS_ERROR_UNKNOWN_METHOD */
             DEBUG(1, ("No matching method found for %s.\n", method));
-            reply->reply_message = dbus_message_new_error(message, DBUS_ERROR_UNKNOWN_METHOD, NULL);
+            reply = dbus_message_new_error(message, DBUS_ERROR_UNKNOWN_METHOD, NULL);
         }
     }
     else {
@@ -540,24 +532,20 @@ DBusHandlerResult sbus_message_handler(DBusConnection *conn,
                 /* If we have been asked for introspection data and we have
                  * an introspection function registered, user that.
                  */
-                ret = ctx->method_ctx->introspect_fn(message, reply);
-                if (ret != EOK) {
-                    talloc_free(reply);
-                    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-                }
+                ret = ctx->method_ctx->introspect_fn(message, ctx, &reply);
+                if (ret != EOK) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
             }
         }
         else
             return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
-    DEBUG(5, ("Method %s complete. Reply was %ssent.\n", method, reply->reply_message?"":"not "));
+    DEBUG(5, ("Method %s complete. Reply was %ssent.\n", method, reply?"":"not "));
 
-    if (reply->reply_message) {
-        dbus_connection_send(conn, reply->reply_message, NULL);
-        dbus_message_unref(reply->reply_message);
+    if (reply) {
+        dbus_connection_send(conn, reply, NULL);
+        dbus_message_unref(reply);
     }
-    talloc_free(reply);
 
     return DBUS_HANDLER_RESULT_HANDLED;
 }