From: Andrew Bartlett Date: Fri, 19 Dec 2014 01:42:08 +0000 (+1300) Subject: dsdb: Ignore errors from search in dns_notify module X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=eabc177bf674a43f6b9442c8a89af0203befb3f1 dsdb: Ignore errors from search in dns_notify module This ensures the error messages are unchanged Pair-programmed-with: Garming Sam Signed-off-by: Garming Sam Signed-off-by: Andrew Bartlett --- diff --git a/source4/dsdb/samdb/ldb_modules/dns_notify.c b/source4/dsdb/samdb/ldb_modules/dns_notify.c index bee6a6e1d04..2481a413082 100644 --- a/source4/dsdb/samdb/ldb_modules/dns_notify.c +++ b/source4/dsdb/samdb/ldb_modules/dns_notify.c @@ -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);