From: Jo Sutton Date: Mon, 12 Feb 2024 03:49:44 +0000 (+1300) Subject: s4:dsdb: Remove trailing whitespace X-Git-Tag: tdb-1.4.11~1731 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f439bd39430e63975fb803aff2f8c19f6a4342cb;p=thirdparty%2Fsamba.git s4:dsdb: Remove trailing whitespace Signed-off-by: Jo Sutton Reviewed-by: Andrew Bartlett --- diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c index bdd6b90143d..3b2fcd64525 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass.c @@ -1,4 +1,4 @@ -/* +/* ldb database library Copyright (C) Simo Sorce 2006-2008 @@ -9,12 +9,12 @@ 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 . */ @@ -24,7 +24,7 @@ * * Component: objectClass sorting and constraint checking module * - * Description: + * Description: * - sort the objectClass attribute into the class * hierarchy and perform constraint checks (correct RDN name, * valid parent), @@ -198,12 +198,12 @@ static int get_search_callback(struct ldb_request *req, struct ldb_reply *ares) The resulting DN should be: CN=Admins,CN=Users,DC=samba,DC=example,DC=com - + */ static int fix_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, - struct ldb_dn *newdn, struct ldb_dn *parent_dn, - struct ldb_dn **fixed_dn) + struct ldb_dn *newdn, struct ldb_dn *parent_dn, + struct ldb_dn **fixed_dn) { char *upper_rdn_attr; const struct ldb_val *rdn_val; @@ -216,7 +216,7 @@ static int fix_dn(struct ldb_context *ldb, } /* We need the attribute name in upper case */ - upper_rdn_attr = strupper_talloc(*fixed_dn, + upper_rdn_attr = strupper_talloc(*fixed_dn, ldb_dn_get_rdn_name(newdn)); if (upper_rdn_attr == NULL) { return ldb_oom(ldb); @@ -385,7 +385,7 @@ static int objectclass_do_add(struct oc_context *ac) instanceType = ldb_msg_find_attr_as_uint(msg, "instanceType", 0); if (!(instanceType & INSTANCE_TYPE_IS_NC_HEAD)) { - ldb_asprintf_errstring(ldb, "objectclass: Cannot add %s, parent does not exist!", + ldb_asprintf_errstring(ldb, "objectclass: Cannot add %s, parent does not exist!", ldb_dn_get_linearized(msg->dn)); return LDB_ERR_NO_SUCH_OBJECT; } @@ -781,7 +781,7 @@ static int oc_modify_callback(struct ldb_request *req, struct ldb_reply *ares) ac, ac->req->op.mod.message->dn, LDB_SCOPE_BASE, "(objectClass=*)", - attrs, NULL, + attrs, NULL, ac, get_search_callback, ac->req); LDB_REQ_SET_LOCATION(search_req); @@ -1447,7 +1447,7 @@ static int objectclass_init(struct ldb_module *module) if (ret != LDB_SUCCESS) { return ret; } - + /* Look for the opaque to indicate we might have to cut down the DN of defaultObjectCategory */ ldb_module_set_private(module, ldb_get_opaque(ldb, DSDB_EXTENDED_DN_STORE_FORMAT_OPAQUE_NAME)); diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c index da4217a2ff3..4d7f3d10b31 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c @@ -226,8 +226,8 @@ static int attr_handler(struct oc_context *ac) !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) && !ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK)) { /* Odd is for the target. Illegal to modify */ - ldb_asprintf_errstring(ldb, - "objectclass_attrs: attribute '%s' on entry '%s' must not be modified directly, it is a linked attribute", + ldb_asprintf_errstring(ldb, + "objectclass_attrs: attribute '%s' on entry '%s' must not be modified directly, it is a linked attribute", msg->elements[i].name, ldb_dn_get_linearized(msg->dn)); return LDB_ERR_UNWILLING_TO_PERFORM; @@ -474,7 +474,7 @@ static int attr_handler2(struct oc_context *ac) } if (!found) { /* we allow this for dbcheck to fix the rest of this broken entry */ - if (!ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK) || + if (!ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK) || ac->req->operation == LDB_ADD) { ldb_asprintf_errstring(ldb, "objectclass_attrs: attribute '%s' on entry '%s' does not exist in the specified objectclasses!", msg->elements[i].name, diff --git a/source4/dsdb/samdb/ldb_modules/util.h b/source4/dsdb/samdb/ldb_modules/util.h index 63726c031de..9589ae247bb 100644 --- a/source4/dsdb/samdb/ldb_modules/util.h +++ b/source4/dsdb/samdb/ldb_modules/util.h @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. Samba utility functions