From: Joseph Sutton Date: Mon, 31 Jul 2023 04:39:38 +0000 (+1200) Subject: s4:rpc_server: Add missing newlines to debugging messages X-Git-Tag: tevent-0.16.0~1206 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a04d6791729a1a6eddced87eac3d07a2ded502;p=thirdparty%2Fsamba.git s4:rpc_server: Add missing newlines to debugging messages Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c index 8a8ba4b4f22..b1c7e2a9b23 100644 --- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c +++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c @@ -128,7 +128,7 @@ static struct dnsserver_state *dnsserver_connect(struct dcesrv_call_state *dce_c dsstate->samdb = dcesrv_samdb_connect_as_user(dsstate, dce_call); if (dsstate->samdb == NULL) { - DEBUG(0,("dnsserver: Failed to open samdb")); + DEBUG(0,("dnsserver: Failed to open samdb\n")); goto failed; } @@ -165,7 +165,7 @@ static struct dnsserver_state *dnsserver_connect(struct dcesrv_call_state *dce_c dsstate->zones_count++; } else { /* Ignore duplicate zone */ - DEBUG(3,("dnsserver: Ignoring duplicate zone '%s' from '%s'", + DEBUG(3,("dnsserver: Ignoring duplicate zone '%s' from '%s'\n", z->name, ldb_dn_get_linearized(z->zone_dn))); } z = znext; @@ -801,7 +801,7 @@ static WERROR dnsserver_query_server(struct dnsserver_state *dsstate, return WERR_OK; } - DEBUG(0,("dnsserver: Invalid server operation %s", operation)); + DEBUG(0,("dnsserver: Invalid server operation %s\n", operation)); return WERR_DNS_ERROR_INVALID_PROPERTY; } @@ -1073,7 +1073,7 @@ static WERROR dnsserver_query_zone(struct dnsserver_state *dsstate, return WERR_OK; } - DEBUG(0,("dnsserver: Invalid zone operation %s", operation)); + DEBUG(0,("dnsserver: Invalid zone operation %s\n", operation)); return WERR_DNS_ERROR_INVALID_PROPERTY; } @@ -1206,11 +1206,11 @@ static WERROR dnsserver_operate_server(struct dnsserver_state *dsstate, } if (valid_operation) { - DEBUG(0, ("dnsserver: server operation '%s' not implemented", operation)); + DEBUG(0, ("dnsserver: server operation '%s' not implemented\n", operation)); return WERR_CALL_NOT_IMPLEMENTED; } - DEBUG(0, ("dnsserver: invalid server operation '%s'", operation)); + DEBUG(0, ("dnsserver: invalid server operation '%s'\n", operation)); return WERR_DNS_ERROR_INVALID_PROPERTY; } @@ -1489,11 +1489,11 @@ static WERROR dnsserver_complex_operate_server(struct dnsserver_state *dsstate, } if (valid_operation) { - DEBUG(0, ("dnsserver: server complex operation '%s' not implemented", operation)); + DEBUG(0, ("dnsserver: server complex operation '%s' not implemented\n", operation)); return WERR_CALL_NOT_IMPLEMENTED; } - DEBUG(0, ("dnsserver: invalid server complex operation '%s'", operation)); + DEBUG(0, ("dnsserver: invalid server complex operation '%s'\n", operation)); return WERR_DNS_ERROR_INVALID_PROPERTY; } @@ -1579,11 +1579,11 @@ static WERROR dnsserver_operate_zone(struct dnsserver_state *dsstate, } if (valid_operation) { - DEBUG(0, ("dnsserver: zone operation '%s' not implemented", operation)); + DEBUG(0, ("dnsserver: zone operation '%s' not implemented\n", operation)); return WERR_CALL_NOT_IMPLEMENTED; } - DEBUG(0, ("dnsserver: invalid zone operation '%s'", operation)); + DEBUG(0, ("dnsserver: invalid zone operation '%s'\n", operation)); return WERR_DNS_ERROR_INVALID_PROPERTY; } @@ -1608,7 +1608,7 @@ static WERROR dnsserver_complex_operate_zone(struct dnsserver_state *dsstate, } } - DEBUG(0,("dnsserver: Invalid zone operation %s", operation)); + DEBUG(0,("dnsserver: Invalid zone operation %s\n", operation)); return WERR_DNS_ERROR_INVALID_PROPERTY; } diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c index 002d9e622cc..65f55864257 100644 --- a/source4/rpc_server/dnsserver/dnsdata.c +++ b/source4/rpc_server/dnsserver/dnsdata.c @@ -407,7 +407,7 @@ void dnsp_to_dns_copy(TALLOC_CTX *mem_ctx, struct dnsp_DnssrvRpcRecord *dnsp, default: memcpy(&dns->data, &dnsp->data, sizeof(union DNS_RPC_RECORD_DATA)); - DEBUG(0, ("dnsserver: Found Unhandled DNS record type=%d", dnsp->wType)); + DEBUG(0, ("dnsserver: Found Unhandled DNS record type=%d\n", dnsp->wType)); } } @@ -654,7 +654,7 @@ WERROR dns_to_dnsp_convert(TALLOC_CTX *mem_ctx, struct DNS_RPC_RECORD *dns, default: memcpy(&dnsp->data, &dns->data, sizeof(union dnsRecordData)); - DEBUG(0, ("dnsserver: Found Unhandled DNS record type=%d", dns->wType)); + DEBUG(0, ("dnsserver: Found Unhandled DNS record type=%d\n", dns->wType)); } *out_dnsp = dnsp; @@ -797,7 +797,7 @@ struct dns_tree *dns_build_tree(TALLOC_CTX *mem_ctx, const char *name, struct ld for (i=0; icount; i++) { ptr = ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL); if (ptr == NULL) { - DBG_ERR("dnsserver: dns record has no name (%s)", + DBG_ERR("dnsserver: dns record has no name (%s)\n", ldb_dn_get_linearized(res->msgs[i]->dn)); goto failed; } @@ -974,7 +974,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx, ptr = ldb_msg_find_attr_as_string(msg, "name", NULL); if (ptr == NULL) { - DBG_ERR("dnsserver: dns record has no name (%s)", + DBG_ERR("dnsserver: dns record has no name (%s)\n", ldb_dn_get_linearized(msg->dn)); return WERR_INTERNAL_DB_ERROR; } @@ -993,7 +993,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx, ndr_err = ndr_pull_struct_blob(&el->values[j], mem_ctx, &dnsp_rec, (ndr_pull_flags_fn_t)ndr_pull_dnsp_DnssrvRpcRecord); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - DEBUG(0, ("dnsserver: Unable to parse dns record (%s)", ldb_dn_get_linearized(msg->dn))); + DEBUG(0, ("dnsserver: Unable to parse dns record (%s)\n", ldb_dn_get_linearized(msg->dn))); return WERR_INTERNAL_DB_ERROR; } diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c index 50d699f245b..2db0f9a4622 100644 --- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c +++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c @@ -493,7 +493,7 @@ static WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TA case DRSUAPI_DS_NAME_FORMAT_LIST_SITES: case DRSUAPI_DS_NAME_FORMAT_UPN_AND_ALTSECID: case DRSUAPI_DS_NAME_FORMAT_UPN_FOR_LOGON: - DBG_ERR("DsCrackNames: Unsupported operation requested: %X", + DBG_ERR("DsCrackNames: Unsupported operation requested: %X\n", r->in.req->req1.format_offered); return WERR_OK; case DRSUAPI_DS_NAME_FORMAT_LIST_INFO_FOR_SERVER: diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index 74b173c3965..7e46df344ca 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -1804,7 +1804,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta collect_objects_attrs, NULL); if (ret != LDB_SUCCESS) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Manager object %s - %s", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Manager object %s - %s\n", ldb_dn_get_linearized(search_dn), ldb_errstring(b_state->sam_ctx))); TALLOC_FREE(frame); @@ -1812,7 +1812,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta } if ((*search_res)->count != 1) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Manager object %s - %u objects returned", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Manager object %s - %u objects returned\n", ldb_dn_get_linearized(search_dn), (*search_res)->count)); TALLOC_FREE(frame); @@ -1845,7 +1845,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta ret = samdb_reference_dn(b_state->sam_ctx, frame, server_dn, "serverReference", &machine_dn); if (ret != LDB_SUCCESS) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to find serverReference in %s - %s", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to find serverReference in %s - %s\n", ldb_dn_get_linearized(server_dn), ldb_errstring(b_state->sam_ctx))); TALLOC_FREE(frame); @@ -1855,7 +1855,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta ret = samdb_reference_dn(b_state->sam_ctx, frame, machine_dn, "rIDSetReferences", &rid_set_dn); if (ret != LDB_SUCCESS) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to find rIDSetReferences in %s - %s", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to find rIDSetReferences in %s - %s\n", ldb_dn_get_linearized(server_dn), ldb_errstring(b_state->sam_ctx))); TALLOC_FREE(frame); @@ -1870,7 +1870,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta collect_objects_attrs, NULL); if (ret != LDB_SUCCESS) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Set object %s - %s", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Set object %s - %s\n", ldb_dn_get_linearized(rid_set_dn), ldb_errstring(b_state->sam_ctx))); TALLOC_FREE(frame); @@ -1878,7 +1878,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta } if (search_res2->count != 1) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Set object %s - %u objects returned", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get RID Set object %s - %u objects returned\n", ldb_dn_get_linearized(rid_set_dn), search_res2->count)); TALLOC_FREE(frame); @@ -1892,7 +1892,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta collect_objects_attrs, NULL); if (ret != LDB_SUCCESS) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get server object %s - %s", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get server object %s - %s\n", ldb_dn_get_linearized(server_dn), ldb_errstring(b_state->sam_ctx))); TALLOC_FREE(frame); @@ -1900,7 +1900,7 @@ static WERROR getncchanges_collect_objects_exop(struct drsuapi_bind_state *b_sta } if (search_res3->count != 1) { - DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get server object %s - %u objects returned", + DEBUG(1, ("DRSUAPI_EXOP_FSMO_RID_ALLOC: Failed to get server object %s - %u objects returned\n", ldb_dn_get_linearized(server_dn), search_res3->count)); TALLOC_FREE(frame); @@ -2052,7 +2052,7 @@ static WERROR getncchanges_get_sorted_array(const struct drsuapi_DsReplicaLinked *ret_array = NULL; guid_array = talloc_array(mem_ctx, struct la_for_sorting, link_count); if (guid_array == NULL) { - DEBUG(0, ("Out of memory allocating %u linked attributes for sorting", link_count)); + DEBUG(0, ("Out of memory allocating %u linked attributes for sorting\n", link_count)); return WERR_NOT_ENOUGH_MEMORY; } @@ -3612,7 +3612,7 @@ allowed: r->out.ctr->ctr6.linked_attributes_count = link_count; r->out.ctr->ctr6.linked_attributes = talloc_array(r->out.ctr, struct drsuapi_DsReplicaLinkedAttribute, link_count); if (r->out.ctr->ctr6.linked_attributes == NULL) { - DEBUG(0, ("Out of memory allocating %u linked attributes for output", link_count)); + DEBUG(0, ("Out of memory allocating %u linked attributes for output\n", link_count)); return WERR_NOT_ENOUGH_MEMORY; } diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 575bf845539..c468ec0c780 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -2876,7 +2876,7 @@ static NTSTATUS dcesrv_lsa_EnumAccountRights(struct dcesrv_call_state *dce_call, return NT_STATUS_OBJECT_NAME_NOT_FOUND; } if (ret != 1) { - DEBUG(3, ("searching for account rights for SID: %s failed: %s", + DEBUG(3, ("searching for account rights for SID: %s failed: %s\n", dom_sid_string(mem_ctx, r->in.sid), ldb_errstring(state->pdb))); return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -3020,7 +3020,7 @@ static NTSTATUS dcesrv_lsa_AddRemoveAccountRights(struct dcesrv_call_state *dce_ talloc_free(msg); return NT_STATUS_OK; } - DEBUG(3, ("Could not %s attributes from %s: %s", + DEBUG(3, ("Could not %s attributes from %s: %s\n", LDB_FLAG_MOD_TYPE(ldb_flag) == LDB_FLAG_MOD_DELETE ? "delete" : "add", ldb_dn_get_linearized(msg->dn), ldb_errstring(state->pdb))); talloc_free(msg); diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 5570359728f..f5c9dae7006 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -1120,7 +1120,7 @@ static NTSTATUS dcesrv_samr_CreateDomainGroup(struct dcesrv_call_state *dce_call d_state = h->data; if (d_state->builtin) { - DEBUG(5, ("Cannot create a domain group in the BUILTIN domain")); + DEBUG(5, ("Cannot create a domain group in the BUILTIN domain\n")); return NT_STATUS_ACCESS_DENIED; } @@ -1471,7 +1471,7 @@ static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALL d_state = h->data; if (d_state->builtin) { - DEBUG(5, ("Cannot create a user in the BUILTIN domain")); + DEBUG(5, ("Cannot create a user in the BUILTIN domain\n")); return NT_STATUS_ACCESS_DENIED; } else if (r->in.acct_flags == ACB_DOMTRUST) { /* Domain trust accounts must be created by the LSA calls */ @@ -1778,7 +1778,7 @@ static NTSTATUS dcesrv_samr_EnumDomainUsers(struct dcesrv_call_state *dce_call, } if (ac->num_entries == 0) { - DBG_WARNING("No users in domain %s", + DBG_WARNING("No users in domain %s\n", ldb_dn_get_linearized(d_state->domain_dn)); talloc_free(ac); @@ -1895,7 +1895,7 @@ static NTSTATUS dcesrv_samr_CreateDomAlias(struct dcesrv_call_state *dce_call, T d_state = h->data; if (d_state->builtin) { - DEBUG(5, ("Cannot create a domain alias in the BUILTIN domain")); + DEBUG(5, ("Cannot create a domain alias in the BUILTIN domain\n")); return NT_STATUS_ACCESS_DENIED; } diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index 0efe896e4e1..72a00e865e0 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -94,7 +94,7 @@ static NTSTATUS dcesrv_init_endpoints(struct task_server *task, if (use_single_process) { model_ops = process_model_startup("single"); if (model_ops == NULL) { - DBG_ERR("Unable to load single process model"); + DBG_ERR("Unable to load single process model\n"); return NT_STATUS_INTERNAL_ERROR; } } else { diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c index d7a22626b53..9847fc33c9f 100644 --- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c +++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c @@ -739,7 +739,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } info.info0 = &ctr0->array[i]; @@ -780,7 +780,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } info.info1 = &ctr1->array[i]; @@ -824,7 +824,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } info.info2 = &ctr2->array[i]; @@ -868,7 +868,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } info.info501 = &ctr501->array[i]; @@ -912,7 +912,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call, nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } info.info502 = &ctr502->array[i]; @@ -1835,7 +1835,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } @@ -1887,7 +1887,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } @@ -1941,7 +1941,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; } @@ -1995,7 +1995,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL nterr = share_get_config(mem_ctx, sctx, snames[i], &scfg); if (!NT_STATUS_IS_OK(nterr)) { - DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration", snames[i])); + DEBUG(1, ("ERROR: Service [%s] disappeared after enumeration\n", snames[i])); return WERR_GEN_FAILURE; }