summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-07-30 19:38:11 +0200
committerJakub Hrozek <jhrozek@redhat.com>2012-08-07 11:39:16 +0200
commitafa8de34e6b3e9f6f0a7c2d5ad57736ebb72f78b (patch)
tree47e4390555e258ce992ce590306ba487288b7ec2 /src
parent2990aa5980401fdc818e89a96f4e2d3e0dcc3247 (diff)
downloadsssd_unused-afa8de34e6b3e9f6f0a7c2d5ad57736ebb72f78b.zip
sssd_unused-afa8de34e6b3e9f6f0a7c2d5ad57736ebb72f78b.tar.gz
sssd_unused-afa8de34e6b3e9f6f0a7c2d5ad57736ebb72f78b.tar.xz
Subdomains: Send the DP reply in the correct format
The DP was sending the reply in a format the responder did not expect, so the responder always failed to parse the message.
Diffstat (limited to 'src')
-rw-r--r--src/providers/data_provider_be.c55
1 files changed, 41 insertions, 14 deletions
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index 0717bff..2e4ee07 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -316,29 +316,56 @@ static void get_subdomains_callback(struct be_req *req,
DBusMessage *reply;
DBusConnection *dbus_conn;
dbus_bool_t dbret;
+ dbus_uint16_t err_maj = 0;
+ dbus_uint32_t err_min = 0;
+ const char *err_msg = NULL;
DEBUG(SSSDBG_TRACE_FUNC, ("Backend returned: (%d, %d, %s) [%s]\n",
dp_err_type, errnum, errstr?errstr:"<NULL>",
dp_pam_err_to_string(req, dp_err_type, errnum)));
reply = (DBusMessage *)req->pvt;
- dbret = dbus_message_append_args(reply,
- DBUS_TYPE_UINT32, &errnum,
- DBUS_TYPE_INVALID);
- if (!dbret) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n"));
- dbus_message_unref(reply);
- return;
- }
- dbus_conn = sbus_get_connection(req->becli->conn);
- if (dbus_conn == NULL) {
- DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n"));
- return;
+ if (reply) {
+ /* Return a reply if one was requested
+ * There may not be one if this request began
+ * while we were offline
+ */
+ err_maj = dp_err_type;
+ err_min = errnum;
+ if (errstr) {
+ err_msg = errstr;
+ } else {
+ err_msg = dp_pam_err_to_string(req, dp_err_type, errnum);
+ }
+ if (!err_msg) {
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ ("Failed to set err_msg, Out of memory?\n"));
+ err_msg = "OOM";
+ }
+
+ dbret = dbus_message_append_args(reply,
+ DBUS_TYPE_UINT16, &err_maj,
+ DBUS_TYPE_UINT32, &err_min,
+ DBUS_TYPE_STRING, &err_msg,
+ DBUS_TYPE_INVALID);
+
+ if (!dbret) {
+ DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n"));
+ dbus_message_unref(reply);
+ goto done;
+ }
+
+ dbus_conn = sbus_get_connection(req->becli->conn);
+ if (dbus_conn == NULL) {
+ DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n"));
+ goto done;
+ }
+ dbus_connection_send(dbus_conn, reply, NULL);
+ dbus_message_unref(reply);
}
- dbus_connection_send(dbus_conn, reply, NULL);
- dbus_message_unref(reply);
+done:
talloc_free(req);
}