diff options
| author | Simo Sorce <idra@samba.org> | 2009-02-24 14:53:31 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2009-02-24 16:39:51 -0500 |
| commit | 3621d86ad205dcacb50022f8e6b669218600257f (patch) | |
| tree | 039418120ac2786e566e80c9d269664286a33eb7 /server/nss/nsssrv_dp.c | |
| parent | c14486feb47672a3562989ddb00653f58357e368 (diff) | |
| download | sssd-3621d86ad205dcacb50022f8e6b669218600257f.tar.gz sssd-3621d86ad205dcacb50022f8e6b669218600257f.tar.xz 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/nss/nsssrv_dp.c')
| -rw-r--r-- | server/nss/nsssrv_dp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/server/nss/nsssrv_dp.c b/server/nss/nsssrv_dp.c index b5746e869..487ac285d 100644 --- a/server/nss/nsssrv_dp.c +++ b/server/nss/nsssrv_dp.c @@ -281,19 +281,20 @@ done: return err; } -static int nss_dp_identity(DBusMessage *message, struct sbus_message_ctx *reply) +static int nss_dp_identity(DBusMessage *message, void *data, DBusMessage **r) { dbus_uint16_t version = DATA_PROVIDER_VERSION; dbus_uint16_t clitype = DP_CLI_FRONTEND; const char *cliname = "NSS"; const char *nullname = ""; + DBusMessage *reply; dbus_bool_t ret; DEBUG(4,("Sending ID reply: (%d,%d,%s)\n", clitype, version, cliname)); - reply->reply_message = dbus_message_new_method_return(message); - ret = dbus_message_append_args(reply->reply_message, + reply = dbus_message_new_method_return(message); + ret = dbus_message_append_args(reply, DBUS_TYPE_UINT16, &clitype, DBUS_TYPE_UINT16, &version, DBUS_TYPE_STRING, &cliname, @@ -303,6 +304,7 @@ static int nss_dp_identity(DBusMessage *message, struct sbus_message_ctx *reply) return EIO; } + *r = reply; return EOK; } |