Attachment 704993 Details for Bug 910938 – [PATCH 1/5] Provide a be_file_account_request function

[patch] [PATCH 1/5] Provide a be_file_account_request function

0001-Provide-a-be_file_account_request-function.patch (text/plain), 4.39 KB, created by Jakub Hrozek on 2013-03-04 13:58:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Hrozek

Created: 2013-03-04 13:58:40 UTC

Size: 4.39 KB

patch

obsolete

>From 59f8af95534fc4c30530ea5d300dbb790c2a8ef1 Mon Sep 17 00:00:00 2001
>From: Jakub Hrozek <jhrozek@redhat.com>
>Date: Fri, 22 Feb 2013 11:01:38 +0100
>Subject: [PATCH 1/5] Provide a be_file_account_request function
>
>---
> src/providers/data_provider_be.c | 86 ++++++++++++++++++++++------------------
> src/providers/dp_backend.h       |  3 ++
> 2 files changed, 51 insertions(+), 38 deletions(-)
>
>diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
>index 08fa9bf032ba2a5531c71d8c653222478a0014e8..c1feafd77fbb6ee6c417946ed50ce78fe4d06e83 100644
>--- a/src/providers/data_provider_be.c
>+++ b/src/providers/data_provider_be.c
>@@ -893,8 +893,6 @@ static int be_get_account_info(DBusMessage *message, struct sbus_connection *con
>         goto done;
>     }
> 
>-    be_req->req_data = req;
>-
>     if ((attr_type != BE_ATTR_CORE) &&
>         (attr_type != BE_ATTR_MEM) &&
>         (attr_type != BE_ATTR_ALL)) {
>@@ -941,50 +939,62 @@ static int be_get_account_info(DBusMessage *message, struct sbus_connection *con
>         goto done;
>     }
> 
>+    ret = be_file_account_request(be_req, req);
>+    if (ret != EOK) {
>+        err_maj = DP_ERR_FATAL;
>+        err_min = ret;
>+        err_msg = "Cannot file account request";
>+        goto done;
>+    }
>+
>+    return EOK;
>+
>+done:
>+    if (be_req) {
>+        talloc_free(be_req);
>+    }
>+
>+    if (reply) {
>+        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) return EIO;
>+
>+        DEBUG(4, ("Request processed. Returned %d,%d,%s\n",
>+                  err_maj, err_min, err_msg));
>+
>+        /* send reply back */
>+        sbus_conn_send_reply(conn, reply);
>+        dbus_message_unref(reply);
>+    }
>+
>+    return EOK;
>+}
>+
>+errno_t be_file_account_request(struct be_req *be_req, struct be_acct_req *ar)
>+{
>+    errno_t ret;
>+    struct be_ctx *be_ctx = be_req->be_ctx;
>+
>+    be_req->req_data = ar;
>+
>     /* see if we need a pre request call, only done for initgroups for now */
>-    if ((type & 0xFF) == BE_REQ_INITGROUPS) {
>+    if ((ar->entry_type & 0xFF) == BE_REQ_INITGROUPS) {
>         ret = be_initgroups_prereq(be_req);
>         if (ret) {
>-            err_maj = DP_ERR_FATAL;
>-            err_min = ret;
>-            err_msg = "Prerequest failed";
>-            goto done;
>+            DEBUG(SSSDBG_CRIT_FAILURE, ("Prerequest failed"));
>+            return ret;
>         }
>     }
> 
>     /* process request */
>-
>-    ret = be_file_request(becli->bectx->bet_info[BET_ID].pvt_bet_data,
>-                          be_req,
>-                          becli->bectx->bet_info[BET_ID].bet_ops->handler);
>+    ret = be_file_request(be_ctx, be_req,
>+                          be_ctx->bet_info[BET_ID].bet_ops->handler);
>     if (ret != EOK) {
>-        err_maj = DP_ERR_FATAL;
>-        err_min = ret;
>-        err_msg = "Failed to file request";
>-        goto done;
>-    }
>-
>-    return EOK;
>-
>-done:
>-    if (be_req) {
>-        talloc_free(be_req);
>-    }
>-
>-    if (reply) {
>-        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) return EIO;
>-
>-        DEBUG(4, ("Request processed. Returned %d,%d,%s\n",
>-                  err_maj, err_min, err_msg));
>-
>-        /* send reply back */
>-        sbus_conn_send_reply(conn, reply);
>-        dbus_message_unref(reply);
>+        DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to file request"));
>+        return ret;
>     }
> 
>     return EOK;
>diff --git a/src/providers/dp_backend.h b/src/providers/dp_backend.h
>index 28fb4a22a581e2cfbc2b916026dea2ab35371d76..848c74f35648fb425f7fa98bbe7ada2d57350dc6 100644
>--- a/src/providers/dp_backend.h
>+++ b/src/providers/dp_backend.h
>@@ -249,4 +249,7 @@ void *be_req_get_data(struct be_req *be_req);
> void be_req_terminate(struct be_req *be_req,
>                       int dp_err_type, int errnum, const char *errstr);
> 
>+/* Request account information */
>+errno_t be_file_account_request(struct be_req *be_req, struct be_acct_req *ar);
>+
> #endif /* __DP_BACKEND_H___ */
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 910938: 704993 | 704995 | 704996 | 704997 | 704998 | 705198 | 705200 | 705201 | 705202