Run the original operation before we update linked attrs

This causes the linked attribute modifies to occour after the original
operation is entered in the transaction (any failure still fails the
lot).  This means (I hope) that we can have another module search the
originating record when the backlink is created, filling in the GUID
and SID for the extended DN.

Andrew Bartlett

diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index dd199c0137522f803efcc728d2c5fca50321c610..f16eb215a6426c500c3a4222df7eaf4bf4cac0a8 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -249,10 +249,14 @@ static int linked_attributes_add(struct ldb_module *module, struct ldb_request *
                return ldb_next_request(module, req);
        }
 
                return ldb_next_request(module, req);
        }
 

-       /* start with the first one */
-       return la_do_mod_request(ac);
+       /* start with the original request */
+       return la_down_req(ac);

 }
 
 }
 

+/* For a delete or rename, we need to find out what linked attributes
+ * are currently on this DN, and then deal with them.  This is the
+ * callback to the base search */
+

 static int la_mod_search_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        const struct dsdb_attribute *schema_attr;
 static int la_mod_search_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        const struct dsdb_attribute *schema_attr;


@@ -349,8 +353,8 @@ static int la_mod_search_callback(struct ldb_request *req, struct ldb_reply *are
 
                talloc_free(ares);
 
 
                talloc_free(ares);
 

-               /* All mods set up, start with the first one */
-               ret = la_do_mod_request(ac);
+               /* Start with the original request */
+               ret = la_down_req(ac);

                if (ret != LDB_SUCCESS) {
                        return ldb_module_done(ac->req, NULL, NULL, ret);
                }
                if (ret != LDB_SUCCESS) {
                        return ldb_module_done(ac->req, NULL, NULL, ret);
                }


@@ -539,8 +543,8 @@ static int linked_attributes_modify(struct ldb_module *module, struct ldb_reques
                
        } else {
                if (ac->ops) {
                
        } else {
                if (ac->ops) {

-                       /* Jump directly to handling the modifies */
-                       ret = la_do_mod_request(ac);
+                       /* Start with the original request */
+                       ret = la_down_req(ac);

                } else {
                        /* nothing to do for this module, proceed */
                        talloc_free(ac);
                } else {
                        /* nothing to do for this module, proceed */
                        talloc_free(ac);


@@ -732,12 +736,8 @@ static int la_op_search_callback(struct ldb_request *req,
 
                talloc_free(ares);
 
 
                talloc_free(ares);
 

-               if (ac->ops) {
-                       /* start the mod requests chain */
-                       ret = la_do_mod_request(ac);
-               } else {
-                       ret = la_down_req(ac);
-               }
+               /* start the mod requests chain */
+               ret = la_down_req(ac);

                if (ret != LDB_SUCCESS) {
                        return ldb_module_done(ac->req, NULL, NULL, ret);
                }
                if (ret != LDB_SUCCESS) {
                        return ldb_module_done(ac->req, NULL, NULL, ret);
                }


@@ -840,11 +840,13 @@ static int la_mod_callback(struct ldb_request *req, struct ldb_reply *ares)
                talloc_free(os);
        }
 
                talloc_free(os);
        }
 

-       /* as last op run the original request */
+       /* If we still have modifies in the queue, then run them */

        if (ac->ops) {
                ret = la_do_mod_request(ac);
        } else {
        if (ac->ops) {
                ret = la_do_mod_request(ac);
        } else {

-               ret = la_down_req(ac);
+               /* Otherwise, we are done! */
+               ret = ldb_module_done(ac->req, ares->controls,
+                                     ares->response, ares->error);

        }
 
        if (ret != LDB_SUCCESS) {
        }
 
        if (ret != LDB_SUCCESS) {


@@ -898,6 +900,7 @@ static int la_down_req(struct la_context *ac)
        return ldb_next_request(ac->module, down_req);
 }
 
        return ldb_next_request(ac->module, down_req);
 }
 

+/* Having done the original operation, then try to fix up all the linked attributes */

 static int la_down_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        struct la_context *ac;
 static int la_down_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
        struct la_context *ac;


@@ -920,9 +923,13 @@ static int la_down_callback(struct ldb_request *req, struct ldb_reply *ares)
                return ldb_module_done(ac->req, NULL, NULL,
                                        LDB_ERR_OPERATIONS_ERROR);
        }
                return ldb_module_done(ac->req, NULL, NULL,
                                        LDB_ERR_OPERATIONS_ERROR);
        }

-
-       return ldb_module_done(ac->req, ares->controls,
-                               ares->response, ares->error);
+       /* If we have modfies to make, then run them */
+       if (ac->ops) {
+               return la_do_mod_request(ac);
+       } else {
+               return ldb_module_done(ac->req, ares->controls,
+                                     ares->response, ares->error);
+       }

 }
 
 _PUBLIC_ const struct ldb_module_ops ldb_linked_attributes_module_ops = {
 }
 
 _PUBLIC_ const struct ldb_module_ops ldb_linked_attributes_module_ops = {