diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c index bf9a2335445..4f58644f3ba 100644 --- a/source3/libads/authdata.c +++ b/source3/libads/authdata.c @@ -240,7 +240,7 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx, goto out; } - /* Now return the PAC information to the callers. We ingore + /* Now return the PAC information to the callers. We ignore * the session_info and instead pick out the PAC via the * private_data on the auth_context */ status = gensec_session_info(gensec_server_context, tmp_ctx, &session_info); diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 9a5ca567ca9..50f4a6de3c6 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -880,7 +880,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm, goto done; /* Not a fatal error. */ } - /* Yes, this is a race conditon... too bad. */ + /* Yes, this is a race condition... too bad. */ if (rename(SYSTEM_KRB5_CONF_PATH, newpath) == -1) { DEBUG(0,("create_local_private_krb5_conf_for_domain: rename " "of %s to %s failed. Errno %s\n", diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 3ba32d0cf44..2853e15dfd3 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -165,7 +165,7 @@ static int ldap_search_with_timeout(LDAP *ld, /* Setup alarm timeout. */ CatchSignal(SIGALRM, gotalarm_sig); /* Make the alarm time one second beyond - the timout we're setting for the + the timeout we're setting for the remote search timeout, to allow that to fire in preference. */ alarm(to+1); @@ -1244,7 +1244,7 @@ static ADS_STATUS ads_do_paged_search_args(ADS_STRUCT *ads, ExternalCtrl.ldctl_oid = discard_const_p(char, external_control->control); ExternalCtrl.ldctl_iscritical = (char) external_control->critical; - /* win2k does not accept a ldctl_value beeing passed in */ + /* win2k does not accept a ldctl_value being passed in */ if (external_control->val != 0) { @@ -2342,7 +2342,7 @@ done: * @param machine_name the NetBIOS name of the computer, which is used to identify the computer account. * @param spns An array or strings for the service principals to add, * i.e. 'cifs/machine_name', 'http/machine.full.domain.com' etc. - * @return 0 upon sucess, or non-zero if a failure occurs + * @return 0 upon success, or non-zero if a failure occurs **/ ADS_STATUS ads_add_service_principal_names(ADS_STRUCT *ads, @@ -2534,7 +2534,7 @@ done: /** * adds a machine account to the ADS server - * @param ads An intialized ADS_STRUCT + * @param ads An initialized ADS_STRUCT * @param machine_name - the NetBIOS machine name of this account. * @param account_type A number indicating the type of account to create * @param org_unit The LDAP path in which to place this account @@ -2718,7 +2718,7 @@ done: /** * move a machine account to another OU on the ADS server - * @param ads - An intialized ADS_STRUCT + * @param ads - An initialized ADS_STRUCT * @param machine_name - the NetBIOS machine name of this account. * @param org_unit - The LDAP path in which to place this account * @param moved - whether we moved the machine account (optional) @@ -3208,7 +3208,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res) if ((*num_strings) != range_start) { DEBUG(1, ("ads_pull_strings_range: Range attribute (%s) doesn't start at %u, but at %lu" - " - aborting range retreival\n", + " - aborting range retrieval\n", range_attr, (unsigned int)(*num_strings) + 1, range_start)); ldap_memfree(range_attr); *more_strings = False; @@ -3219,7 +3219,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res) if (*more_strings && ((*num_strings + num_new_strings) != (range_end + 1))) { DEBUG(1, ("ads_pull_strings_range: Range attribute (%s) tells us we have %lu " - "strings in this bunch, but we only got %lu - aborting range retreival\n", + "strings in this bunch, but we only got %lu - aborting range retrieval\n", range_attr, (unsigned long int)range_end - range_start + 1, (unsigned long int)num_new_strings)); ldap_memfree(range_attr); @@ -3268,7 +3268,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res) * @param msg Results of search * @param field Attribute to retrieve * @param v Pointer to int to store result - * @return boolean inidicating success + * @return boolean indicating success */ bool ads_pull_uint32(ADS_STRUCT *ads, LDAPMessage *msg, const char *field, uint32_t *v) @@ -3317,7 +3317,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res) * @param msg Results of search * @param field Attribute to retrieve * @param sid Pointer to sid to store result - * @return boolean inidicating success + * @return boolean indicating success */ bool ads_pull_sid(ADS_STRUCT *ads, LDAPMessage *msg, const char *field, struct dom_sid *sid) @@ -3382,7 +3382,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res) * @param msg Results of search * @param field Attribute to retrieve * @param sd Pointer to *struct security_descriptor to store result (talloc()ed) - * @return boolean inidicating success + * @return boolean indicating success */ bool ads_pull_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, LDAPMessage *msg, const char *field, @@ -4030,7 +4030,7 @@ static char **get_addl_hosts(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, /* * Windows DC implicitly adds a short name for each FQDN added to - * msDS-AdditionalDnsHostName, but it comes with a strage binary + * msDS-AdditionalDnsHostName, but it comes with a strange binary * suffix "\0$" which we should ignore (see bug #14406). */ diff --git a/source3/libads/sitename_cache.c b/source3/libads/sitename_cache.c index 885d30ab936..4bf2ca7ae2e 100644 --- a/source3/libads/sitename_cache.c +++ b/source3/libads/sitename_cache.c @@ -38,7 +38,7 @@ static char *sitename_key(TALLOC_CTX *mem_ctx, const char *realm) /**************************************************************************** Store the AD client sitename. - We store indefinately as every new CLDAP query will re-write this. + We store indefinitely as every new CLDAP query will re-write this. ****************************************************************************/ bool sitename_store(const char *realm, const char *sitename) @@ -61,7 +61,7 @@ bool sitename_store(const char *realm, const char *sitename) return ret; } - expire = get_time_t_max(); /* Store indefinately. */ + expire = get_time_t_max(); /* Store indefinitely. */ DEBUG(10,("sitename_store: realm = [%s], sitename = [%s], expire = [%u]\n", realm, sitename, (unsigned int)expire ));