diff options
| author | Simo Sorce <ssorce@redhat.com> | 2009-11-11 20:44:23 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-11-12 11:00:50 -0500 |
| commit | 00f1caee627e89f53d707bdeccce8719bd5d5a97 (patch) | |
| tree | 2ce8c6b12d4b2d9d4117eeddcc66773cf149cb16 | |
| parent | 0ec8cc5f817adb46402d10bb72a9e0dd6818e2a2 (diff) | |
| download | sssd-00f1caee627e89f53d707bdeccce8719bd5d5a97.tar.gz sssd-00f1caee627e89f53d707bdeccce8719bd5d5a97.tar.bz2 sssd-00f1caee627e89f53d707bdeccce8719bd5d5a97.zip | |
Change var name to make its use more clear.
Change memctx to make clear it should be used only when a callback is being
used.
| -rw-r--r-- | server/responder/common/responder.h | 2 | ||||
| -rw-r--r-- | server/responder/common/responder_dp.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server/responder/common/responder.h b/server/responder/common/responder.h index 439bf873..a597e68e 100644 --- a/server/responder/common/responder.h +++ b/server/responder/common/responder.h @@ -143,7 +143,7 @@ struct cli_protocol_version *register_cli_protocol_version(void); typedef void (*sss_dp_callback_t)(uint16_t err_maj, uint32_t err_min, const char *err_msg, void *ptr); -int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx, +int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *callback_memctx, sss_dp_callback_t callback, void *callback_ctx, int timeout, const char *domain, int type, const char *opt_name, uint32_t opt_id); diff --git a/server/responder/common/responder_dp.c b/server/responder/common/responder_dp.c index 236755f5..943b72c5 100644 --- a/server/responder/common/responder_dp.c +++ b/server/responder/common/responder_dp.c @@ -232,7 +232,7 @@ error: } static int sss_dp_send_acct_req_create(struct resp_ctx *rctx, - TALLOC_CTX *memctx, + TALLOC_CTX *callback_memctx, const char *domain, uint32_t be_type, char *filter, @@ -241,7 +241,7 @@ static int sss_dp_send_acct_req_create(struct resp_ctx *rctx, void *callback_ctx, struct sss_dp_req **ndp); -int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx, +int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *callback_memctx, sss_dp_callback_t callback, void *callback_ctx, int timeout, const char *domain, int type, const char *opt_name, uint32_t opt_id) @@ -329,7 +329,7 @@ int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx, goto done; } - cb = talloc_zero(memctx, struct sss_dp_callback); + cb = talloc_zero(callback_memctx, struct sss_dp_callback); if (!cb) { ret = ENOMEM; goto done; @@ -350,7 +350,7 @@ int sss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx, /* No such request in progress * Create a new request */ - ret = sss_dp_send_acct_req_create(rctx, memctx, domain, + ret = sss_dp_send_acct_req_create(rctx, callback_memctx, domain, be_type, filter, timeout, callback, callback_ctx, &sdp_req); @@ -402,7 +402,7 @@ done: } static int sss_dp_send_acct_req_create(struct resp_ctx *rctx, - TALLOC_CTX *memctx, + TALLOC_CTX *callback_memctx, const char *domain, uint32_t be_type, char *filter, @@ -478,7 +478,7 @@ static int sss_dp_send_acct_req_create(struct resp_ctx *rctx, sdp_req->pending_reply = pending_reply; if (callback) { - cb = talloc_zero(memctx, struct sss_dp_callback); + cb = talloc_zero(callback_memctx, struct sss_dp_callback); if (!cb) { dbus_message_unref(msg); talloc_zfree(sdp_req); |