From: Andreas Schneider Date: Fri, 30 Jun 2023 10:06:01 +0000 (+0200) Subject: s3:auth: Fix code spelling X-Git-Tag: talloc-2.4.1~104 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e57f034f013bda65618898f22f3fb0cb903f0d94;p=thirdparty%2Fsamba.git s3:auth: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton --- diff --git a/source3/auth/auth.c b/source3/auth/auth.c index b388b619d75..b5e40928df0 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. Password and authentication handling Copyright (C) Andrew Bartlett 2001-2002 @@ -86,7 +86,7 @@ NTSTATUS auth_get_ntlm_challenge(struct auth_context *auth_context, uint8_t chal[8]) { if (auth_context->challenge.length) { - DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning previous challenge by module %s (normal)\n", + DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning previous challenge by module %s (normal)\n", auth_context->challenge_set_by)); memcpy(chal, auth_context->challenge.data, 8); return NT_STATUS_OK; @@ -111,14 +111,14 @@ NTSTATUS auth_get_ntlm_challenge(struct auth_context *auth_context, * Check user is in correct domain (if required) * * @param user Only used to fill in the debug message - * + * * @param domain The domain to be verified * - * @return True if the user can connect with that domain, + * @return True if the user can connect with that domain, * False otherwise. **/ -static bool check_domain_match(const char *user, const char *domain) +static bool check_domain_match(const char *user, const char *domain) { /* * If we aren't serving to trusted domains, we must make sure that @@ -127,8 +127,8 @@ static bool check_domain_match(const char *user, const char *domain) */ if (!lp_allow_trusted_domains() && - !(strequal("", domain) || - strequal(lp_workgroup(), domain) || + !(strequal("", domain) || + strequal(lp_workgroup(), domain) || is_myname(domain))) { DEBUG(1, ("check_domain_match: Attempt to connect as user %s from domain %s denied.\n", user, domain)); return False; @@ -146,17 +146,17 @@ static bool check_domain_match(const char *user, const char *domain) * This function does NOT need to be in a become_root()/unbecome_root() pair * as it makes the calls itself when needed. * - * The return value takes precedence over the contents of the server_info - * struct. When the return is other than NT_STATUS_OK the contents + * The return value takes precedence over the contents of the server_info + * struct. When the return is other than NT_STATUS_OK the contents * of that structure is undefined. * * @param user_info Contains the user supplied components, including the passwords. * Must be created with make_user_info() or one of its wrappers. * - * @param auth_context Supplies the challenges and some other data. - * Must be created with make_auth_context(), and the challenges should be - * filled in, either at creation or by calling the challenge geneation - * function auth_get_challenge(). + * @param auth_context Supplies the challenges and some other data. + * Must be created with make_auth_context(), and the challenges should be + * filled in, either at creation or by calling the challenge generation + * function auth_get_challenge(). * * @param pserver_info If successful, contains information about the authentication, * including a struct samu struct describing the user. @@ -198,10 +198,10 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx, *pauthoritative = 1; - DEBUG(3, ("check_ntlm_password: Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n", + DEBUG(3, ("check_ntlm_password: Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n", user_info->client.domain_name, user_info->client.account_name, user_info->workstation_name)); - DEBUG(3, ("check_ntlm_password: mapped user is: [%s]\\[%s]@[%s]\n", + DEBUG(3, ("check_ntlm_password: mapped user is: [%s]\\[%s]@[%s]\n", user_info->mapped.domain_name, user_info->mapped.account_name, user_info->workstation_name)); if (auth_context->challenge.length != 8) { @@ -218,7 +218,7 @@ NTSTATUS auth_check_ntlm_password(TALLOC_CTX *mem_ctx, dump_data(5, auth_context->challenge.data, auth_context->challenge.length); #ifdef DEBUG_PASSWORD - DEBUG(100, ("user_info has passwords of length %d and %d\n", + DEBUG(100, ("user_info has passwords of length %d and %d\n", (int)user_info->password.response.lanman.length, (int)user_info->password.response.nt.length)); DEBUG(100, ("lm:\n")); dump_data(100, user_info->password.response.lanman.data, user_info->password.response.lanman.length); @@ -487,7 +487,7 @@ static NTSTATUS make_auth_context_text_list(TALLOC_CTX *mem_ctx, return nt_status; } - for (;*text_list; text_list++) { + for (;*text_list; text_list++) { if (load_auth_module(*auth_context, *text_list, &t)) { DLIST_ADD_END(list, t); } diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c index 046b9793e33..646fbea272f 100644 --- a/source3/auth/auth_builtin.c +++ b/source3/auth/auth_builtin.c @@ -109,7 +109,7 @@ static NTSTATUS auth_init_anonymous( /** * Return an error based on username * - * This function allows the testing of obsure errors, as well as the generation + * This function allows the testing of obscure errors, as well as the generation * of NT_STATUS -> DOS error mapping tables. * * This module is of no value to end-users. diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c index 673f441d9a5..f9570455fe3 100644 --- a/source3/auth/auth_generic.c +++ b/source3/auth/auth_generic.c @@ -85,7 +85,7 @@ static NTSTATUS auth3_generate_session_info_pac(struct auth4_context *auth_ctx, if (pac_blob == NULL) { /* - * This should already be catched at the main + * This should already be caught at the main * gensec layer, but better check twice */ status = NT_STATUS_INTERNAL_ERROR; diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 9fe407ee5e9..293523f4272 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -2295,7 +2295,7 @@ bool is_trusted_domain(const char* dom_name) /* on a logon error possibly map the error to success if "map to guest" - is set approriately + is set appropriately */ NTSTATUS do_map_to_guest_server_info(TALLOC_CTX *mem_ctx, NTSTATUS status, diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c index 3b8d1a95769..46db4f21f7a 100644 --- a/source3/auth/auth_winbind.c +++ b/source3/auth/auth_winbind.c @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. - Winbind authentication mechnism + Winbind authentication mechanism Copyright (C) Tim Potter 2000 Copyright (C) Andrew Bartlett 2001 - 2002 diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c index 30125809563..1e55fedb615 100644 --- a/source3/auth/check_samsec.c +++ b/source3/auth/check_samsec.c @@ -429,7 +429,7 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge, user_info, &user_sess_key, &lm_sess_key); /* - * We must re-load the sam acount information under a mutex + * We must re-load the sam account information under a mutex * lock to ensure we don't miss any concurrent account lockout * changes. */ @@ -589,7 +589,7 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge, done: /* - * Always flush the getpwsid cache or this will grow indefinetly for + * Always flush the getpwsid cache or this will grow indefinitely for * each NTLM auththentication. */ memcache_flush(NULL, PDB_GETPWSID_CACHE); diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c index c761d3e4fda..15025e7f1d4 100644 --- a/source3/auth/pampass.c +++ b/source3/auth/pampass.c @@ -22,7 +22,7 @@ /* * This module provides PAM based functions for validation of - * username/password pairs, account managment, session and access control. + * username/password pairs, account management, session and access control. * Note: SMB password checking is done in smbpass.c */ @@ -95,7 +95,7 @@ static bool smb_pam_error_handler(pam_handle_t *pamh, int pam_error, const char /******************************************************************* This function is a sanity check, to make sure that we NEVER report - failure as sucess. + failure as success. *********************************************************************/ static bool smb_pam_nt_status_error_handler(pam_handle_t *pamh, int pam_error, @@ -137,7 +137,7 @@ static int smb_pam_conv(int num_msg, return PAM_CONV_ERR; /* - * Apparantly HPUX has a buggy PAM that doesn't support the + * Apparently HPUX has a buggy PAM that doesn't support the * appdata_ptr. Fail if this is the case. JRA. */ @@ -306,7 +306,7 @@ static int smb_pam_passchange_conv(int num_msg, return PAM_CONV_ERR; /* - * Apparantly HPUX has a buggy PAM that doesn't support the + * Apparently HPUX has a buggy PAM that doesn't support the * appdata_ptr. Fail if this is the case. JRA. */ @@ -607,7 +607,7 @@ static NTSTATUS smb_pam_setcred(pam_handle_t *pamh, const char * user) NTSTATUS nt_status = NT_STATUS_NO_TOKEN; /* - * This will allow samba to aquire a kerberos token. And, when + * This will allow samba to acquire a kerberos token. And, when * exporting an AFS cell, be able to /write/ to this cell. */ diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index d7e3e6ad3a5..3b74c8ffdd8 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -258,7 +258,7 @@ NTSTATUS pass_check(const struct passwd *pass, if NT_STATUS_IS_OK(nt_status) { return (nt_status); } else if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_WRONG_PASSWORD)) { - /* No point continuing if its not the password thats to blame (ie PAM disabled). */ + /* No point continuing if its not the password that's to blame (ie PAM disabled). */ return (nt_status); } diff --git a/source3/auth/proto.h b/source3/auth/proto.h index 9bffce7a808..d40422d5187 100644 --- a/source3/auth/proto.h +++ b/source3/auth/proto.h @@ -64,8 +64,8 @@ NTSTATUS auth_get_ntlm_challenge(struct auth_context *auth_context, * This function does NOT need to be in a become_root()/unbecome_root() pair * as it makes the calls itself when needed. * - * The return value takes precedence over the contents of the server_info - * struct. When the return is other than NT_STATUS_OK the contents + * The return value takes precedence over the contents of the server_info + * struct. When the return is other than NT_STATUS_OK the contents * of that structure is undefined. * * @param mem_ctx The memory context to use to allocate server_info @@ -73,10 +73,10 @@ NTSTATUS auth_get_ntlm_challenge(struct auth_context *auth_context, * @param user_info Contains the user supplied components, including the passwords. * Must be created with make_user_info() or one of its wrappers. * - * @param auth_context Supplies the challenges and some other data. - * Must be created with make_auth_context(), and the challenges should be - * filled in, either at creation or by calling the challenge geneation - * function auth_get_challenge(). + * @param auth_context Supplies the challenges and some other data. + * Must be created with make_auth_context(), and the challenges should be + * filled in, either at creation or by calling the challenge generation + * function auth_get_challenge(). * * @param pserver_info If successful, contains information about the authentication, * including a struct samu struct describing the user.