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.

1 files changed, 13 insertions, 13 deletions

diff --git a/server/infopipe/infopipe.h b/server/infopipe/infopipe.h
index 9db5c0d16..ed5092ed1 100644
--- a/server/infopipe/infopipe.h
+++ b/server/infopipe/infopipe.h
@@ -47,13 +47,13 @@
  * org.freedesktop.DBus.Introspectable interface
  */
 #define INFP_INTROSPECT "Introspect"
-int infp_introspect(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_introspect(DBusMessage *message, void *data, DBusMessage **r);
 
 /**********************************************************
  * Permission Methods (from infopipe.c)                   *
  **********************************************************/
 #define INFP_CHECK_PERMISSIONS "CheckPermissions1"
-int infp_check_permissions(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_check_permissions(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_PERMISSION_METHODS \
     {INFP_CHECK_PERMISSIONS,infp_check_permissions},
@@ -62,22 +62,22 @@ int infp_check_permissions(DBusMessage *message, struct sbus_message_ctx *reply)
  * User Methods (from infopipe_users.c)                   *
  **********************************************************/
 #define INFP_USERS_GET_CACHED "GetCachedUsers1"
-int infp_users_get_cached(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_users_get_cached(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_USERS_CREATE "CreateUser1"
-int infp_users_create(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_users_create(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_USERS_DELETE "DeleteUser1"
-int infp_users_delete(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_users_delete(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_USERS_GET_ATTR "GetUserAttributes1"
-int infp_users_get_attr(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_users_get_attr(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_USERS_SET_ATTR "SetUserAttributes1"
-int infp_users_set_attr(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_users_set_attr(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_USERS_SET_UID "Set_YouReallyDoNotWantToUseThisFunction_UserUID1"
-int infp_users_set_uid(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_users_set_uid(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_USER_METHODS \
     {INFP_USERS_GET_CACHED, infp_users_get_cached}, \
@@ -92,19 +92,19 @@ int infp_users_set_uid(DBusMessage *message, struct sbus_message_ctx *reply);
  **********************************************************/
 
 #define INFP_GROUPS_CREATE "CreateGroup1"
-int infp_groups_create(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_groups_create(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_GROUPS_DELETE "DeleteGroup1"
-int infp_groups_delete(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_groups_delete(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_GROUPS_ADD_MEMBERS "AddGroupMembers1"
-int infp_groups_add_members(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_groups_add_members(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_GROUPS_REMOVE_MEMBERS "RemoveGroupMembers1"
-int infp_groups_remove_members(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_groups_remove_members(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_GROUPS_SET_GID "Set_YouReallyDoNotWantToUseThisFunction_GroupGID1"
-int infp_groups_set_gid(DBusMessage *message, struct sbus_message_ctx *reply);
+int infp_groups_set_gid(DBusMessage *message, void *data, DBusMessage **r);
 
 #define INFP_GROUP_METHODS \
     {INFP_GROUPS_CREATE, infp_groups_create}, \