From 7485d4d588188c1167d10c05b637d969f8241864 Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Fri, 2 Aug 2024 11:26:49 +1200 Subject: [PATCH] s4:dsdb: Remove trailing whitespace Signed-off-by: Jo Sutton Reviewed-by: Douglas Bagnall --- source4/dsdb/kcc/kcc_periodic.c | 20 ++++++++++---------- source4/dsdb/repl/drepl_partitions.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c index 7f0a5320a2a..4af8b85983a 100644 --- a/source4/dsdb/kcc/kcc_periodic.c +++ b/source4/dsdb/kcc/kcc_periodic.c @@ -1,23 +1,23 @@ -/* +/* Unix SMB/CIFS Implementation. KCC service periodic handling - + Copyright (C) Andrew Tridgell 2009 based on repl service code - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . - + */ #include "includes.h" @@ -207,7 +207,7 @@ NTSTATUS kccsrv_add_repsFrom(struct kccsrv_service *s, TALLOC_CTX *mem_ctx, werr = dsdb_loadreps(s->samdb, mem_ctx, p->dn, "repsFrom", &our_reps, &our_count); if (!W_ERROR_IS_OK(werr)) { - DEBUG(0,(__location__ ": Failed to load repsFrom from %s - %s\n", + DEBUG(0,(__location__ ": Failed to load repsFrom from %s - %s\n", ldb_dn_get_linearized(p->dn), ldb_errstring(s->samdb))); return NT_STATUS_INTERNAL_DB_CORRUPTION; } @@ -265,7 +265,7 @@ NTSTATUS kccsrv_add_repsFrom(struct kccsrv_service *s, TALLOC_CTX *mem_ctx, if (modified) { werr = dsdb_savereps(s->samdb, mem_ctx, p->dn, "repsFrom", our_reps, our_count); if (!W_ERROR_IS_OK(werr)) { - DEBUG(0,(__location__ ": Failed to save repsFrom to %s - %s\n", + DEBUG(0,(__location__ ": Failed to save repsFrom to %s - %s\n", ldb_dn_get_linearized(p->dn), ldb_errstring(s->samdb))); return NT_STATUS_INTERNAL_DB_CORRUPTION; } @@ -277,7 +277,7 @@ NTSTATUS kccsrv_add_repsFrom(struct kccsrv_service *s, TALLOC_CTX *mem_ctx, modified = false; werr = dsdb_loadreps(s->samdb, mem_ctx, p->dn, "repsTo", &our_reps, &our_count); if (!W_ERROR_IS_OK(werr)) { - DEBUG(0,(__location__ ": Failed to load repsTo from %s - %s\n", + DEBUG(0,(__location__ ": Failed to load repsTo from %s - %s\n", ldb_dn_get_linearized(p->dn), ldb_errstring(s->samdb))); return NT_STATUS_INTERNAL_DB_CORRUPTION; } @@ -297,7 +297,7 @@ NTSTATUS kccsrv_add_repsFrom(struct kccsrv_service *s, TALLOC_CTX *mem_ctx, if (modified) { werr = dsdb_savereps(s->samdb, mem_ctx, p->dn, "repsTo", our_reps, our_count); if (!W_ERROR_IS_OK(werr)) { - DEBUG(0,(__location__ ": Failed to save repsTo to %s - %s\n", + DEBUG(0,(__location__ ": Failed to save repsTo to %s - %s\n", ldb_dn_get_linearized(p->dn), ldb_errstring(s->samdb))); return NT_STATUS_INTERNAL_DB_CORRUPTION; } diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index c525329ee7c..403dc9e0a10 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -1,22 +1,22 @@ -/* +/* Unix SMB/CIFS Implementation. DSDB replication service - + Copyright (C) Stefan Metzmacher 2007 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . - + */ #include "includes.h" @@ -387,7 +387,7 @@ static struct dreplsrv_partition_source_dsa *dreplsrv_find_source_dsa(struct dre return s; } } - return NULL; + return NULL; } @@ -405,7 +405,7 @@ static WERROR dreplsrv_partition_add_source_dsa(struct dreplsrv_service *s, source = talloc_zero(p, struct dreplsrv_partition_source_dsa); W_ERROR_HAVE_NO_MEMORY(source); - ndr_err = ndr_pull_struct_blob(val, source, + ndr_err = ndr_pull_struct_blob(val, source, &source->_repsFromBlob, (ndr_pull_flags_fn_t)ndr_pull_repsFromToBlob); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -425,7 +425,7 @@ static WERROR dreplsrv_partition_add_source_dsa(struct dreplsrv_service *s, status = dreplsrv_out_connection_attach(s, source->repsFrom1, &source->conn); W_ERROR_NOT_OK_RETURN(status); - if (check_list && + if (check_list && dreplsrv_find_source_dsa(check_list, &source->repsFrom1->source_dsa_obj_guid)) { /* its in the check list, don't add it again */ talloc_free(source); @@ -604,7 +604,7 @@ static WERROR dreplsrv_refresh_partition(struct dreplsrv_service *s, } else { dn = r->msgs[0]->dn; } - + talloc_free(discard_const(p->nc.dn)); ZERO_STRUCT(p->nc); p->nc.dn = ldb_dn_alloc_linearized(p, dn);