git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d225fc)
Revert "debug"
authorStefan Metzmacher <metze@samba.org>
Fri, 16 Nov 2012 21:43:24 +0000 (22:43 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 19 Nov 2012 11:02:09 +0000 (12:02 +0100)
This reverts commit f9b6d2eeec85664cd3ef8435e0388863ba9d0784.

source4/dsdb/samdb/ldb_modules/descriptor.c patch | blob | history

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index ad7df0c785fb315e2dce0ace9bae6ff641bad137..e6668bfee6d0cc96f1d1e278030f76e1455a146b 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -780,29 +780,20 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
        int ret;
 
        if (!ares) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
-
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
        }
 
        if (ares->type == LDB_REPLY_REFERRAL) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                return ldb_module_send_referral(req, ares->referral);
        }
 
        if (ares->error != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                return ldb_module_done(req, ares->controls,
                                       ares->response, ares->error);
        }
 
        if (ares->type != LDB_REPLY_DONE) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -817,8 +808,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
                                 DSDB_SEARCH_SHOW_DELETED,
                                 req, "(objectClass=*)");
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL, ret);
        }
@@ -829,8 +818,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
 
                mod_res = talloc_zero(res, struct ldb_result);
                if (!mod_res) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                        return ldb_module_done(req, NULL, NULL,
                                               LDB_ERR_OPERATIONS_ERROR);
                }
@@ -843,8 +830,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
                                        req);
                LDB_REQ_SET_LOCATION(sub_req);
                if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                        talloc_free(ares);
                        return ldb_module_done(req, NULL, NULL,
                                               LDB_ERR_OPERATIONS_ERROR);
@@ -856,8 +841,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
                                              LDB_CONTROL_RECALCULATE_SD_OID,
                                              true, req);
                if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                        talloc_free(ares);
                        return ldb_module_done(req, NULL, NULL,
                                               LDB_ERR_OPERATIONS_ERROR);
@@ -866,8 +849,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
                                              LDB_CONTROL_AS_SYSTEM_OID,
                                              false, NULL);
                if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                        talloc_free(ares);
                        return ldb_module_done(req, NULL, NULL,
                                               LDB_ERR_OPERATIONS_ERROR);
@@ -877,8 +858,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
                                              LDB_CONTROL_SHOW_DELETED_OID,
                                              false, NULL);
                if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                        talloc_free(ares);
                        return ldb_module_done(req, NULL, NULL,
                                               LDB_ERR_OPERATIONS_ERROR);
@@ -897,8 +876,6 @@ static int descriptor_modify_callback(struct ldb_request *mod_req,
                        ret = ldb_wait(sub_req->handle, LDB_WAIT_ALL);
                }
                if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                        talloc_free(ares);
                        return ldb_module_done(req, NULL, NULL,
                                               LDB_ERR_OPERATIONS_ERROR);
@@ -1010,28 +987,20 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
        struct ldb_result *mod_res;
 
        if (!ares) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
        }
 
        if (ares->type == LDB_REPLY_REFERRAL) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                return ldb_module_send_referral(req, ares->referral);
        }
 
        if (ares->error != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                return ldb_module_done(req, ares->controls,
                                       ares->response, ares->error);
        }
 
        if (ares->type != LDB_REPLY_DONE) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1039,8 +1008,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
 
        msg = ldb_msg_new(ares);
        if (msg == NULL) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1049,8 +1016,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
 
        mod_res = talloc_zero(msg, struct ldb_result);
        if (mod_res == NULL) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1064,8 +1029,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
                                req);
        LDB_REQ_SET_LOCATION(mod_req);
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1077,8 +1040,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
                                      LDB_CONTROL_RECALCULATE_SD_OID,
                                      true, req);
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1087,8 +1048,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
                                      LDB_CONTROL_AS_SYSTEM_OID,
                                      false, NULL);
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1098,8 +1057,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
                                      LDB_CONTROL_SHOW_DELETED_OID,
                                      false, NULL);
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1108,8 +1065,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
                                      LDB_CONTROL_SHOW_RECYCLED_OID,
                                      false, NULL);
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
@@ -1120,8 +1075,6 @@ static int descriptor_rename_callback(struct ldb_request *rename_req,
                ret = ldb_wait(mod_req->handle, LDB_WAIT_ALL);
        }
        if (ret != LDB_SUCCESS) {
-       ldb_debug(ldb, LDB_DEBUG_FATAL,"%s:%s: HERE\n",
-                 __location__, __FUNCTION__);
                talloc_free(ares);
                return ldb_module_done(req, NULL, NULL,
                                       LDB_ERR_OPERATIONS_ERROR);
Work in progress branches