From: Joseph Sutton Date: Fri, 1 Sep 2023 01:30:37 +0000 (+1200) Subject: s4:dsdb: Fix code spelling X-Git-Tag: tevent-0.16.0~664 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65c26c0b7254f8b2c7276f5cc2a5048d1be91172;p=thirdparty%2Fsamba.git s4:dsdb: Fix code spelling Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 5e0bccb36b0..fb77082e0a1 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -723,7 +723,7 @@ NTSTATUS samdb_result_parameters(TALLOC_CTX *mem_ctx, /* * If the on-disk data is not even in length, we know * it is corrupt, and can not be safely pushed. We - * would either truncate, send either a un-initilaised + * would either truncate, send an uninitialised * byte or send a forced zero byte */ return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -1166,7 +1166,7 @@ int samdb_msg_add_parameters(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, s for (i = 0; i < parameters->length / 2; i++) { /* * The on-disk format needs to be in the 'network' - * format, parmeters->array is a uint16_t array of + * format, parameters->array is a uint16_t array of * length parameters->length / 2 */ SSVAL(val.data, i * 2, parameters->array[i]); @@ -3884,7 +3884,7 @@ int samdb_ntds_site_settings_options(struct ldb_context *ldb_ctx, goto failed; /* Perform a one level (child) search from the local - * site distinguided name. We're looking for the + * site distinguished name. We're looking for the * "options" attribute within the nTDSSiteSettings * object */ @@ -4819,7 +4819,7 @@ int dsdb_normalise_dn_and_find_nc_root(struct ldb_context *samdb, } /* - * Either we are working aginast a remote LDAP + * Either we are working against a remote LDAP * server or the object doesn't exist locally. * * This means any GUID that was present in the DN @@ -6682,7 +6682,7 @@ static int dsdb_count_domain_callback( * * @param ldb [in] Current ldb context * @param count [out] Pointer to the count - * @param base [in] The base dn for the quey + * @param base [in] The base dn for the query * @param dom_sid [in] The domain sid, if non NULL records that are not a member * of the domain are ignored. * @param scope [in] Search scope. diff --git a/source4/dsdb/kcc/kcc_service.h b/source4/dsdb/kcc/kcc_service.h index 0e64741aa74..d702b5af5ea 100644 --- a/source4/dsdb/kcc/kcc_service.h +++ b/source4/dsdb/kcc/kcc_service.h @@ -63,7 +63,7 @@ struct kccsrv_service { /* * the timestamp for the next event, - * this is the timstamp passed to event_add_timed() + * this is the timestamp passed to event_add_timed() */ struct timeval next_event; diff --git a/source4/dsdb/repl/drepl_service.h b/source4/dsdb/repl/drepl_service.h index 7e362d9853d..4451df9d691 100644 --- a/source4/dsdb/repl/drepl_service.h +++ b/source4/dsdb/repl/drepl_service.h @@ -181,7 +181,7 @@ struct dreplsrv_service { /* * the timestamp for the next event, - * this is the timstamp passed to event_add_timed() + * this is the timestamp passed to event_add_timed() */ struct timeval next_event; @@ -192,7 +192,7 @@ struct dreplsrv_service { /* some stuff for running only the incoming notify ops */ struct { /* - * here we have a reference to the immidicate event that was + * here we have a reference to the immediate event that was * scheduled from the DsReplicaSync */ struct tevent_immediate *im; @@ -207,7 +207,7 @@ struct dreplsrv_service { /* * the timestamp for the next event, - * this is the timstamp passed to event_add_timed() + * this is the timestamp passed to event_add_timed() */ struct timeval next_event; diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c index 4e6ee11b755..b4def1411bc 100644 --- a/source4/dsdb/samdb/ldb_modules/acl.c +++ b/source4/dsdb/samdb/ldb_modules/acl.c @@ -220,7 +220,7 @@ static int acl_childClasses(struct ldb_module *module, return LDB_ERR_OPERATIONS_ERROR; } - /* Must remove any existing attribute, or else confusion reins */ + /* Must remove any existing attribute, or else confusion reigns */ ldb_msg_remove_attr(msg, attrName); ret = ldb_msg_add_empty(msg, attrName, 0, &allowedClasses); if (ret != LDB_SUCCESS) { @@ -286,7 +286,7 @@ static int acl_childClassesEffective(struct ldb_module *module, return LDB_ERR_OPERATIONS_ERROR; } - /* Must remove any existing attribute, or else confusion reins */ + /* Must remove any existing attribute, or else confusion reigns */ ldb_msg_remove_attr(msg, "allowedChildClassesEffective"); oc_el = ldb_msg_find_element(sd_msg, "objectClass"); @@ -361,7 +361,7 @@ static int acl_sDRightsEffective(struct ldb_module *module, as_system->critical = 0; } - /* Must remove any existing attribute, or else confusion reins */ + /* Must remove any existing attribute, or else confusion reigns */ ldb_msg_remove_attr(msg, "sDRightsEffective"); ret = ldb_msg_add_empty(msg, "sDRightsEffective", 0, &rightsEffective); if (ret != LDB_SUCCESS) { diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c b/source4/dsdb/samdb/ldb_modules/dirsync.c index bcbcd43b8ac..affa668c9ac 100644 --- a/source4/dsdb/samdb/ldb_modules/dirsync.c +++ b/source4/dsdb/samdb/ldb_modules/dirsync.c @@ -43,7 +43,7 @@ struct dirsync_context { /* * We keep a track of the number of attributes that we * add just for the need of the implementation - * it will be useful to track then entries that needs not to + * it will be useful to track the entries that need not to * be returned because there is no real change */ @@ -149,7 +149,7 @@ static int dirsync_filter_entry(struct ldb_request *req, * We have a O(n'*p') complexity, in worse case n' = n and p' = p * but in most case n' = n/2 (at least half of returned attributes * are not replicated or generated) and p' is small as we - * list only the attribute that have been modified since last interogation + * list only the attribute that have been modified since last interrogation * */ newmsg = ldb_msg_new(dsc->req); @@ -159,7 +159,7 @@ static int dirsync_filter_entry(struct ldb_request *req, for (i = msg->num_elements - 1; i >= 0; i--) { if (ldb_attr_cmp(msg->elements[i].name, "uSNChanged") == 0) { int error = 0; - /* Read the USN it will used at the end of the filtering + /* Read the USN it will be used at the end of the filtering * to update the max USN in the cookie if we * decide to keep this entry */ @@ -271,7 +271,7 @@ static int dirsync_filter_entry(struct ldb_request *req, } /* - * If we don't have an USN and no updateness array then we skip the + * If we don't have an USN and no uptodateness array then we skip the * test phase this is an optimisation for the case when you * first query the DC without a cookie. * As this query is most probably the one @@ -800,7 +800,7 @@ static int dirsync_create_vector(struct ldb_request *req, tab[0].source_dsa_invocation_id = *(dsc->our_invocation_id); - /* We have to add the updateness vector that we have*/ + /* We have to add the uptodateness vector that we have*/ /* Version is always 1 in dirsync cookies */ cookie->blob.extra.uptodateness_vector.version = 1; cookie->blob.extra.uptodateness_vector.reserved = 0; @@ -925,7 +925,7 @@ static int dirsync_search_callback(struct ldb_request *req, struct ldb_reply *ar * It *very* important to steal otherwise as val is in a subcontext * related to res2, when the value will be one more time stolen * it's elements[x].values that will be stolen, so it's important to - * recreate the context hierrachy as if it was done from a ldb_request + * recreate the context hierarchy as if it was done from a ldb_request */ talloc_steal(res->msgs[0]->elements[0].values, val); if (ret != LDB_SUCCESS) { @@ -945,7 +945,7 @@ static int dirsync_search_callback(struct ldb_request *req, struct ldb_reply *ar /* * When outputting flags is used to say more results. - * For the moment we didn't honnor the size info */ + * For the moment we didn't honour the size info */ control->flags = 0; @@ -1143,7 +1143,7 @@ static int dirsync_ldb_search(struct ldb_module *module, struct ldb_request *req } /* * When returning all the attributes return also the SD as - * Windws do so. + * Windows does so. */ if (ldb_attr_in_list(attrs, "*")) { struct ldb_sd_flags_control *sdctr = talloc_zero(dsc, struct ldb_sd_flags_control); @@ -1161,7 +1161,7 @@ static int dirsync_ldb_search(struct ldb_module *module, struct ldb_request *req return ldb_oom(ldb); } /* - * When no attributes are asked we in anycase expect at least 3 attributes: + * When no attributes are asked we in any case expect at least 3 attributes: * * instanceType * * objectGUID * * parentGUID diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c index d7c40c82efc..501891361bc 100644 --- a/source4/dsdb/samdb/ldb_modules/operational.c +++ b/source4/dsdb/samdb/ldb_modules/operational.c @@ -644,7 +644,7 @@ static int construct_msds_isrodc(struct ldb_module *module, /* construct msDS-keyVersionNumber attr - TODO: Make this based on the 'win2k' DS huristics bit... + TODO: Make this based on the 'win2k' DS heuristics bit... */ static int construct_msds_keyversionnumber(struct ldb_module *module, @@ -1442,7 +1442,7 @@ enum op_remove { OPERATIONAL_REMOVE_ALWAYS, /* remove always */ OPERATIONAL_REMOVE_UNASKED,/* remove if not requested */ OPERATIONAL_SD_FLAGS, /* show if SD_FLAGS_OID set, or asked for */ - OPERATIONAL_REMOVE_UNLESS_CONTROL /* remove always unless an adhoc control has been specified */ + OPERATIONAL_REMOVE_UNLESS_CONTROL /* remove always unless an ad hoc control has been specified */ }; /* diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index f065758d50f..0c988ee459e 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -1984,12 +1984,12 @@ static int setup_supplemental_field(struct setup_password_fields_io *io) if (!io->n.cleartext_utf8) { /* * when we don't have a cleartext password - * we can't setup a supplementalCredential value + * we can't setup a supplementalCredentials value */ return LDB_SUCCESS; } - /* if there's an old supplementaCredentials blob then use it */ + /* if there's an old supplementalCredentials blob then use it */ if (io->o.supplemental) { if (io->o.scb.sub.signature == SUPPLEMENTAL_CREDENTIALS_SIGNATURE) { old_scb = &io->o.scb; @@ -3878,7 +3878,7 @@ static int setup_io(struct ph_context *ac, /* * Handles the password change control if it's specified. It has the - * precedance and overrides already specified old password values of + * precedence and overrides already specified old password values of * change requests (but that shouldn't happen since the control is * fully internal and only used in conjunction with replace requests!). */ @@ -4950,7 +4950,7 @@ static int password_hash_modify(struct ldb_module *module, struct ldb_request *r DSDB_CONTROL_RESTORE_TOMBSTONE_OID); if (restore == NULL) { /* - * A tomstone reanimation generates a double update + * A tombstone reanimation generates a double update * of pwdLastSet. * * So we only remove it without the diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 731c81add57..7dcd5f879e0 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -3520,7 +3520,7 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, new_el->num_values = el->num_values; new_el->values = talloc_steal(msg->elements, el->values); - /* TODO: this relises a bit too heavily on the exact + /* TODO: this relies a bit too heavily on the exact behaviour of ldb_msg_find_element and ldb_msg_remove_element */ old_el = ldb_msg_find_element(msg, el->name); diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 1edcba7223d..9752e9eda1c 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -1279,7 +1279,7 @@ static int samldb_add_handle_msDS_IntId(struct samldb_ctx *ac) * * We have to check the DB in case someone else has * modified the database while we are doing our - * changes too (this case should be very bery rare) in + * changes too (this case should be very very rare) in * order to be sure. */ if (dsdb_attribute_by_attributeID_id(schema, msds_intid)) { diff --git a/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c b/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c index 5dfabd933b8..44f7b7750c3 100644 --- a/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c +++ b/source4/dsdb/samdb/ldb_modules/tests/test_audit_util.c @@ -389,7 +389,7 @@ static void test_dsdb_audit_attributes_json(void **state) TALLOC_FREE(msg); /* - * Test a message with a multivalues attributres + * Test a message with a multi-valued attribute */ msg = talloc_zero(ctx, struct ldb_message); ldb_msg_add_string(msg, "attribute01", "value01"); diff --git a/source4/dsdb/samdb/ldb_modules/tests/test_unique_object_sids.c b/source4/dsdb/samdb/ldb_modules/tests/test_unique_object_sids.c index f9065e4e489..2d37d53a066 100644 --- a/source4/dsdb/samdb/ldb_modules/tests/test_unique_object_sids.c +++ b/source4/dsdb/samdb/ldb_modules/tests/test_unique_object_sids.c @@ -440,7 +440,7 @@ static void test_modify_of_objectSID_replicated(void **state) } /* - * Test the a modify with no object SID is passed through correctly + * Test that a modify with no object SID is passed through correctly * */ static void test_modify_no_objectSID(void **state) diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 8b6c598a8a6..d8842203f26 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -766,7 +766,7 @@ int dsdb_check_samba_compatible_feature(struct ldb_module *module, Note that features can be marked as enabled in more than one place. For example, the recyclebin feature is marked as enabled both - on the CN=Partitions,CN=Configurration object and on the NTDS DN of + on the CN=Partitions,CN=Configuration object and on the NTDS DN of each DC in the forest. It seems likely that it is the job of the KCC to propagate between the two */ diff --git a/source4/dsdb/schema/schema_info_attr.c b/source4/dsdb/schema/schema_info_attr.c index 447bc9fd8fc..04b296459fe 100644 --- a/source4/dsdb/schema/schema_info_attr.c +++ b/source4/dsdb/schema/schema_info_attr.c @@ -94,8 +94,8 @@ bool dsdb_schema_info_blob_is_valid(const DATA_BLOB *blob) /** * Parse schemaInfo structure from a data_blob * (DATA_BLOB or ldb_val). - * Suitable for parsing blobs that comes from - * DRS interface of from LDB database + * Suitable for parsing blobs that come from + * DRS interface or from LDB database */ WERROR dsdb_schema_info_from_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct dsdb_schema_info **_schema_info) @@ -167,7 +167,7 @@ WERROR dsdb_blob_from_schema_info(const struct dsdb_schema_info *schema_info, /** * Compares schemaInfo signatures in dsdb_schema and prefixMap. * NOTE: At present function compares schemaInfo values - * as string without taking into account schemVersion field + * as string without taking into account schemaVersion field * * @return WERR_OK if schemaInfos are equal * WERR_DS_DRA_SCHEMA_MISMATCH if schemaInfos are different