dsdb: Ignore errors from search in dns_notify module
authorAndrew Bartlett <abartlet@samba.org>
Fri, 19 Dec 2014 01:42:08 +0000 (14:42 +1300)
committerGarming Sam <garming@samba.org>
Mon, 22 Dec 2014 04:57:08 +0000 (05:57 +0100)
This ensures the error messages are unchanged

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
source4/dsdb/samdb/ldb_modules/dns_notify.c

index bee6a6e1d043897aa2f2f720b2aed441b0702e4b..2481a41308289b10be69eb542e0b6edfc4335589 100644 (file)
@@ -213,13 +213,12 @@ static int dns_notify_modify(struct ldb_module *module, struct ldb_request *req)
                                                    DSDB_SEARCH_REVEAL_INTERNALS |
                                                    DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT, req);
                        if (ret != LDB_SUCCESS) {
-                               ldb_asprintf_errstring(ldb_module_get_ctx(module),
-                                                      "%s: Failed to modify %s, because we failed to find it: %s\n",
-                                                      __func__,
-                                                      ldb_dn_get_linearized(dn),
-                                                      ldb_errstring(ldb_module_get_ctx(module)));
-                               talloc_free(tmp_ctx);
-                               return ret;
+                               /* 
+                                * We want the give the caller the
+                                * error from trying the actual
+                                * request, below 
+                                */
+                               break;
                        }
 
                        schema = dsdb_get_schema(ldb, req);
@@ -287,13 +286,12 @@ static int dns_notify_delete(struct ldb_module *module, struct ldb_request *req)
                                                    DSDB_SEARCH_REVEAL_INTERNALS |
                                                    DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT, req);
                        if (ret != LDB_SUCCESS) {
-                               ldb_asprintf_errstring(ldb_module_get_ctx(module),
-                                                      "%s: Failed to delete %s, because we failed to find it: %s\n",
-                                                      __func__,
-                                                      ldb_dn_get_linearized(old_dn),
-                                                      ldb_errstring(ldb_module_get_ctx(module)));
-                               talloc_free(tmp_ctx);
-                               return ret;
+                               /* 
+                                * We want the give the caller the
+                                * error from trying the actual
+                                * request, below 
+                                */
+                               break;
                        }
 
                        schema = dsdb_get_schema(ldb, req);