summaryrefslogtreecommitdiff
path: root/server/monitor
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2009-02-24 14:53:31 -0500
committerSimo Sorce <idra@samba.org>2009-02-24 16:39:51 -0500
commit3621d86ad205dcacb50022f8e6b669218600257f (patch)
tree039418120ac2786e566e80c9d269664286a33eb7 /server/monitor
parentc14486feb47672a3562989ddb00653f58357e368 (diff)
downloadsssd-3621d86ad205dcacb50022f8e6b669218600257f.tar.gz
sssd-3621d86ad205dcacb50022f8e6b669218600257f.tar.bz2
sssd-3621d86ad205dcacb50022f8e6b669218600257f.zip
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.
Diffstat (limited to 'server/monitor')
-rw-r--r--server/monitor/monitor.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index 45191a68..166cf3cd 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -88,19 +88,22 @@ static void set_global_checker(struct mt_ctx *ctx);
/* dbus_get_monitor_version
* Return the monitor version over D-BUS */
static int dbus_get_monitor_version(DBusMessage *message,
- struct sbus_message_ctx *reply)
+ void *data,
+ DBusMessage **r)
{
const char *version = MONITOR_VERSION;
+ DBusMessage *reply;
dbus_bool_t ret;
- reply->reply_message = dbus_message_new_method_return(message);
- ret = dbus_message_append_args(reply->reply_message, DBUS_TYPE_STRING,
+ reply = dbus_message_new_method_return(message);
+ ret = dbus_message_append_args(reply, DBUS_TYPE_STRING,
&version, DBUS_TYPE_INVALID);
if (!ret) {
return EIO;
}
+ *r = reply;
return EOK;
}