s4-ldb: don't show timestamps on every line of ldb traces

This adds ldb_debug_add() and ldb_debug_end() to format multiline
messages

1 files changed, 42 insertions, 38 deletions

diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 02298c1dff..e93560e559 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -633,78 +633,82 @@ static void ldb_trace_request(struct ldb_context *ldb, struct ldb_request *req)
 
 	switch (req->operation) {
 	case LDB_SEARCH:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: SEARCH");
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " dn: %s",
+		ldb_debug_add(ldb, "ldb_trace_request: SEARCH\n");
+		ldb_debug_add(ldb, " dn: %s\n",
 			  ldb_dn_get_linearized(req->op.search.base));
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " scope: %s", 
+		ldb_debug_add(ldb, " scope: %s\n", 
 			  req->op.search.scope==LDB_SCOPE_BASE?"base":
 			  req->op.search.scope==LDB_SCOPE_ONELEVEL?"one":
 			  req->op.search.scope==LDB_SCOPE_SUBTREE?"sub":"UNKNOWN");
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " expr: %s", 
+		ldb_debug_add(ldb, " expr: %s\n", 
 			  ldb_filter_from_tree(tmp_ctx, req->op.search.tree));
 		if (req->op.search.attrs == NULL) {
-			ldb_debug(ldb, LDB_DEBUG_TRACE, " attr: <ALL>");
+			ldb_debug_add(ldb, " attr: <ALL>\n");
 		} else {
 			for (i=0; req->op.search.attrs[i]; i++) {
-				ldb_debug(ldb, LDB_DEBUG_TRACE, " attr: %s", req->op.search.attrs[i]);
+				ldb_debug_add(ldb, " attr: %s\n", req->op.search.attrs[i]);
 			}
 		}
 		break;
 	case LDB_DELETE:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: DELETE");
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " dn: %s", 
-			  ldb_dn_get_linearized(req->op.del.dn));
+		ldb_debug_add(ldb, "ldb_trace_request: DELETE\n");
+		ldb_debug_add(ldb, " dn: %s\n", 
+			      ldb_dn_get_linearized(req->op.del.dn));
 		break;
 	case LDB_RENAME:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: RENAME");
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " olddn: %s", 
-			  ldb_dn_get_linearized(req->op.rename.olddn));
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " newdn: %s", 
-			  ldb_dn_get_linearized(req->op.rename.newdn));
+		ldb_debug_add(ldb, "ldb_trace_request: RENAME\n");
+		ldb_debug_add(ldb, " olddn: %s\n", 
+			      ldb_dn_get_linearized(req->op.rename.olddn));
+		ldb_debug_add(ldb, " newdn: %s\n", 
+			      ldb_dn_get_linearized(req->op.rename.newdn));
 		break;
 	case LDB_EXTENDED:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: EXTENDED");
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " oid: %s", req->op.extended.oid);
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " data: %s", req->op.extended.data?"yes":"no");
+		ldb_debug_add(ldb, "ldb_trace_request: EXTENDED\n");
+		ldb_debug_add(ldb, " oid: %s\n", req->op.extended.oid);
+		ldb_debug_add(ldb, " data: %s\n", req->op.extended.data?"yes":"no");
 		break;
 	case LDB_ADD:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: ADD");
-		ldb_debug(req->handle->ldb, LDB_DEBUG_TRACE, "%s", 
-			  ldb_ldif_message_string(req->handle->ldb, tmp_ctx, 
-						  LDB_CHANGETYPE_ADD, req->op.add.message));
+		ldb_debug_add(ldb, "ldb_trace_request: ADD\n");
+		ldb_debug_add(req->handle->ldb, "%s\n", 
+			      ldb_ldif_message_string(req->handle->ldb, tmp_ctx, 
+						      LDB_CHANGETYPE_ADD, 
+						      req->op.add.message));
 		break;
 	case LDB_MODIFY:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: MODIFY");
-		ldb_debug(req->handle->ldb, LDB_DEBUG_TRACE, "%s", 
-			  ldb_ldif_message_string(req->handle->ldb, tmp_ctx, 
-						  LDB_CHANGETYPE_ADD, req->op.mod.message));
+		ldb_debug_add(ldb, "ldb_trace_request: MODIFY\n");
+		ldb_debug_add(req->handle->ldb, "%s\n", 
+			      ldb_ldif_message_string(req->handle->ldb, tmp_ctx, 
+						      LDB_CHANGETYPE_ADD, 
+						      req->op.mod.message));
 		break;
 	case LDB_REQ_REGISTER_CONTROL:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: REGISTER_CONTROL");
-		ldb_debug(req->handle->ldb, LDB_DEBUG_TRACE, "%s", 
-			  req->op.reg_control.oid);
+		ldb_debug_add(ldb, "ldb_trace_request: REGISTER_CONTROL\n");
+		ldb_debug_add(req->handle->ldb, "%s\n", 
+			      req->op.reg_control.oid);
 		break;
 	case LDB_REQ_REGISTER_PARTITION:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: REGISTER_PARTITION");
-		ldb_debug(req->handle->ldb, LDB_DEBUG_TRACE, "%s", 
-			  ldb_dn_get_linearized(req->op.reg_partition.dn));
+		ldb_debug_add(ldb, "ldb_trace_request: REGISTER_PARTITION\n");
+		ldb_debug_add(req->handle->ldb, "%s\n", 
+			      ldb_dn_get_linearized(req->op.reg_partition.dn));
 		break;
 	default:
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "ldb_trace_request: UNKNOWN(%u)", 
-			  req->operation);
+		ldb_debug_add(ldb, "ldb_trace_request: UNKNOWN(%u)\n", 
+			      req->operation);
 		break;
 	}
 
 	if (req->controls == NULL) {
-		ldb_debug(ldb, LDB_DEBUG_TRACE, " control: <NONE>");
+		ldb_debug_add(ldb, " control: <NONE>\n");
 	} else {
 		for (i=0; req->controls && req->controls[i]; i++) {
-			ldb_debug(ldb, LDB_DEBUG_TRACE, " control: %s  crit:%u  data:%s", 
-				  req->controls[i]->oid, 
-				  req->controls[i]->critical, 
-				  req->controls[i]->data?"yes":"no");
+			ldb_debug_add(ldb, " control: %s  crit:%u  data:%s\n", 
+				      req->controls[i]->oid, 
+				      req->controls[i]->critical, 
+				      req->controls[i]->data?"yes":"no");
 		}
 	}
+	
+	ldb_debug_end(ldb, LDB_DEBUG_TRACE);
 
 	talloc_free(tmp_ctx);
 }