From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 16 Nov 2012 21:43:24 +0000 (+0100)
Subject: Revert "debug"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=4471d7fe8e93d63990b694277f1b61a3ab3c537a

Revert "debug"

This reverts commit f9b6d2eeec85664cd3ef8435e0388863ba9d0784.
---

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index ad7df0c785fb..e6668bfee6d0 100644
--- 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);