mirror of
https://github.com/samba-team/samba.git
synced 2025-01-10 01:18:15 +03:00
s3:winbindd: Fix code spelling
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
parent
746ef717a7
commit
83b58255ed
@ -782,7 +782,7 @@ again:
|
||||
entry, gidNumber, memctx);
|
||||
}
|
||||
if ( ! tmp) { /* wow very strange entry, how did it match ? */
|
||||
DEBUG(5, ("Unprobable match on (%s), no uidNumber, "
|
||||
DEBUG(5, ("Improbable match on (%s), no uidNumber, "
|
||||
"nor gidNumber returned\n", sidstr));
|
||||
TALLOC_FREE(sidstr);
|
||||
continue;
|
||||
@ -852,7 +852,7 @@ again:
|
||||
|
||||
ret = NT_STATUS_OK;
|
||||
|
||||
/* mark all unknwon/expired ones as unmapped */
|
||||
/* mark all unknown/expired ones as unmapped */
|
||||
for (i = 0; ids[i]; i++) {
|
||||
if (ids[i]->status != ID_MAPPED)
|
||||
ids[i]->status = ID_UNMAPPED;
|
||||
|
@ -47,7 +47,7 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_ma
|
||||
{
|
||||
int i;
|
||||
|
||||
/* initialize the status to avoid suprise */
|
||||
/* initialize the status to avoid surprise */
|
||||
for (i = 0; ids[i]; i++) {
|
||||
ids[i]->status = ID_UNKNOWN;
|
||||
}
|
||||
@ -131,7 +131,7 @@ static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_ma
|
||||
{
|
||||
int i;
|
||||
|
||||
/* initialize the status to avoid suprise */
|
||||
/* initialize the status to avoid surprise */
|
||||
for (i = 0; ids[i]; i++) {
|
||||
ids[i]->status = ID_UNKNOWN;
|
||||
}
|
||||
|
@ -117,7 +117,7 @@ static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_ma
|
||||
NTSTATUS ret;
|
||||
int i;
|
||||
|
||||
/* initialize the status to avoid suprise */
|
||||
/* initialize the status to avoid surprise */
|
||||
for (i = 0; ids[i]; i++) {
|
||||
ids[i]->status = ID_UNKNOWN;
|
||||
}
|
||||
@ -147,7 +147,7 @@ static NTSTATUS idmap_rid_sids_to_unixids(struct idmap_domain *dom, struct id_ma
|
||||
NTSTATUS ret;
|
||||
int i;
|
||||
|
||||
/* initialize the status to avoid suprise */
|
||||
/* initialize the status to avoid surprise */
|
||||
for (i = 0; ids[i]; i++) {
|
||||
ids[i]->status = ID_UNKNOWN;
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ static NTSTATUS idmap_tdb2_set_mapping_action(struct db_context *db,
|
||||
|
||||
DEBUG(10, ("Storing %s <-> %s map\n", state->ksidstr, state->kidstr));
|
||||
|
||||
/* check wheter sid mapping is already present in db */
|
||||
/* check whether sid mapping is already present in db */
|
||||
ret = dbwrap_fetch_bystring(db, tmp_ctx, state->ksidstr, &data);
|
||||
if (NT_STATUS_IS_OK(ret)) {
|
||||
ret = NT_STATUS_OBJECT_NAME_COLLISION;
|
||||
|
@ -358,7 +358,7 @@ static struct wb_lookupsids_domain *wb_lookupsids_get_domain(
|
||||
* checking the sid.
|
||||
*
|
||||
* Note the wb_lookupsids_bulk() above
|
||||
* already catched special SIDs,
|
||||
* already caught special SIDs,
|
||||
* e.g. the unix and builtin domains.
|
||||
*/
|
||||
return &domains[i];
|
||||
|
@ -29,7 +29,7 @@ struct wb_seqnums_state {
|
||||
|
||||
struct tevent_req **subreqs;
|
||||
struct winbindd_domain **domains;
|
||||
NTSTATUS *stati;
|
||||
NTSTATUS *statuses;
|
||||
uint32_t *seqnums;
|
||||
};
|
||||
|
||||
@ -58,11 +58,11 @@ struct tevent_req *wb_seqnums_send(TALLOC_CTX *mem_ctx,
|
||||
state->num_domains);
|
||||
state->domains = talloc_zero_array(state, struct winbindd_domain *,
|
||||
state->num_domains);
|
||||
state->stati = talloc_array(state, NTSTATUS, state->num_domains);
|
||||
state->statuses = talloc_array(state, NTSTATUS, state->num_domains);
|
||||
state->seqnums = talloc_array(state, uint32_t, state->num_domains);
|
||||
|
||||
if ((state->subreqs == NULL) || (state->domains == NULL) ||
|
||||
(state->stati == NULL) || (state->seqnums == NULL)) {
|
||||
(state->statuses == NULL) || (state->seqnums == NULL)) {
|
||||
tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
|
||||
return tevent_req_post(req, ev);
|
||||
}
|
||||
@ -105,7 +105,7 @@ static void wb_seqnums_done(struct tevent_req *subreq)
|
||||
/* found one */
|
||||
|
||||
state->subreqs[i] = NULL;
|
||||
state->stati[i] = status;
|
||||
state->statuses[i] = status;
|
||||
if (NT_STATUS_IS_OK(status)) {
|
||||
state->seqnums[i] = seqnum;
|
||||
|
||||
@ -136,7 +136,7 @@ static void wb_seqnums_done(struct tevent_req *subreq)
|
||||
|
||||
NTSTATUS wb_seqnums_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
|
||||
int *num_domains, struct winbindd_domain ***domains,
|
||||
NTSTATUS **stati, uint32_t **seqnums)
|
||||
NTSTATUS **statuses, uint32_t **seqnums)
|
||||
{
|
||||
struct wb_seqnums_state *state = tevent_req_data(
|
||||
req, struct wb_seqnums_state);
|
||||
@ -147,7 +147,7 @@ NTSTATUS wb_seqnums_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
*num_domains = state->num_domains;
|
||||
*domains = talloc_move(mem_ctx, &state->domains);
|
||||
*stati = talloc_move(mem_ctx, &state->stati);
|
||||
*statuses = talloc_move(mem_ctx, &state->statuses);
|
||||
*seqnums = talloc_move(mem_ctx, &state->seqnums);
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
|
@ -1398,7 +1398,7 @@ int main(int argc, const char **argv)
|
||||
/* Set environment variable so we don't recursively call ourselves.
|
||||
This may also be useful interactively. */
|
||||
if ( !winbind_off() ) {
|
||||
DEBUG(0,("Failed to disable recusive winbindd calls. Exiting.\n"));
|
||||
DEBUG(0,("Failed to disable recursive winbindd calls. Exiting.\n"));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
@ -60,7 +60,7 @@ struct winbindd_cli_state {
|
||||
struct winbindd_response *presp);
|
||||
struct winbindd_request *request; /* Request from client */
|
||||
struct tevent_queue *out_queue;
|
||||
struct winbindd_response *response; /* Respose to client */
|
||||
struct winbindd_response *response; /* Response to client */
|
||||
struct tevent_req *io_req; /* wb_req_read_* or wb_resp_write_* */
|
||||
|
||||
struct getpwent_state *pwent_state; /* State for getpwent() */
|
||||
|
@ -84,7 +84,7 @@ static void ads_cached_connection_reuse(ADS_STRUCT **adsp)
|
||||
* @param[in] target_realm Realm of domain to connect to
|
||||
* @param[in] target_dom_name 'workgroup' name of domain to connect to
|
||||
* @param[in] ldap_server DNS name of server to connect to
|
||||
* @param[in] password Our machine acount secret
|
||||
* @param[in] password Our machine account secret
|
||||
* @param[in] auth_realm Realm of local domain for creating krb token
|
||||
* @param[in] renewable Renewable ticket time
|
||||
*
|
||||
@ -204,7 +204,7 @@ ADS_STATUS ads_idmap_cached_connection(const char *dom_name,
|
||||
|
||||
/*
|
||||
* At this point we only have the NetBIOS domain name.
|
||||
* Check if we can get server nam and realm from SAF cache
|
||||
* Check if we can get server name and realm from SAF cache
|
||||
* and the domain list.
|
||||
*/
|
||||
ldap_server = saf_fetch(tmp_ctx, dom_name);
|
||||
|
@ -1324,7 +1324,7 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
|
||||
/*
|
||||
* We don't use the time element at this moment,
|
||||
* but we have to consume it, so that we don't
|
||||
* neet to change the disk format of the cache.
|
||||
* need to change the disk format of the cache.
|
||||
*/
|
||||
(void)centry_time(centry);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
|
||||
Winbind daemon - cached credentials funcions
|
||||
Winbind daemon - cached credentials functions
|
||||
|
||||
Copyright (C) Robert O'Callahan 2006
|
||||
Copyright (C) Jeremy Allison 2006 (minor fixes to fit into Samba and
|
||||
|
@ -3063,7 +3063,7 @@ retry:
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Open a LSA connection to a DC, suiteable for LSA lookup calls.
|
||||
Open a LSA connection to a DC, suitable for LSA lookup calls.
|
||||
****************************************************************************/
|
||||
|
||||
NTSTATUS cm_connect_lsat(struct winbindd_domain *domain,
|
||||
@ -3219,7 +3219,7 @@ static NTSTATUS cm_connect_netlogon_transport(struct winbindd_domain *domain,
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Open a NETLOGON connection to a DC, suiteable for SamLogon calls.
|
||||
Open a NETLOGON connection to a DC, suitable for SamLogon calls.
|
||||
****************************************************************************/
|
||||
|
||||
NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
|
||||
|
@ -229,7 +229,7 @@ rekinit:
|
||||
|
||||
/* evil rises here, we refresh ticket failed,
|
||||
* but the ticket might be expired. Therefore,
|
||||
* When we refresh ticket failed, destory the
|
||||
* When we refresh ticket failed, destroy the
|
||||
* ticket */
|
||||
|
||||
ads_kdestroy(entry->ccname);
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
|
||||
Winbind daemon - cached credentials funcions
|
||||
Winbind daemon - cached credentials functions
|
||||
|
||||
Copyright (C) Guenther Deschner 2005
|
||||
|
||||
|
@ -2026,7 +2026,7 @@ static void flush_caches_noinit(void)
|
||||
* If domain is not initialized, it means it is never
|
||||
* used or never become online. look, wcache_invalidate_cache()
|
||||
* -> get_cache() -> init_dc_connection(). It causes a lot of traffic
|
||||
* for unused domains and large traffic for primay domain's DC if there
|
||||
* for unused domains and large traffic for primary domain's DC if there
|
||||
* are many domains..
|
||||
*/
|
||||
|
||||
|
@ -199,7 +199,7 @@ NTSTATUS winbindd_getgrnam_recv(struct tevent_req *req,
|
||||
response->length += talloc_get_size(response->extra_data.data);
|
||||
|
||||
D_NOTICE("Winbind external command GETGRNAM end.\n"
|
||||
"Returning %"PRIu32" memmber(s).\n",
|
||||
"Returning %"PRIu32" member(s).\n",
|
||||
response->data.gr.num_gr_mem);
|
||||
|
||||
return NT_STATUS_OK;
|
||||
|
@ -28,7 +28,7 @@
|
||||
* interval in seconds
|
||||
*
|
||||
* Group Policy should be updated every 90 minutes in the background,
|
||||
* with a random offset between 0 and 30 minutes. This ensures mutiple
|
||||
* with a random offset between 0 and 30 minutes. This ensures multiple
|
||||
* clients will not update at the same time.
|
||||
*/
|
||||
#define GPUPDATE_INTERVAL (90*60)
|
||||
|
@ -47,7 +47,7 @@ bool fill_grent(TALLOC_CTX *mem_ctx, struct winbindd_gr *gr,
|
||||
full_group_name = fill_domain_username_talloc(mem_ctx, dom_name,
|
||||
mapped_name, true);
|
||||
}
|
||||
/* Mapped to an aliase */
|
||||
/* Mapped to an alias */
|
||||
else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_RENAMED)) {
|
||||
full_group_name = mapped_name;
|
||||
}
|
||||
|
@ -298,7 +298,7 @@ static NTSTATUS wb_irpc_LogonControl(struct irpc_message *msg,
|
||||
|
||||
/*
|
||||
* NETLOGON_CONTROL_REDISCOVER
|
||||
* get's an optional \dcname appended to the domain name
|
||||
* gets an optional \dcname appended to the domain name
|
||||
*/
|
||||
p = strchr_m(domain_name, '\\');
|
||||
if (p != NULL) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
|
||||
Winbind daemon - pam auth funcions
|
||||
Winbind daemon - pam auth functions
|
||||
|
||||
Copyright (C) Andrew Tridgell 2000
|
||||
Copyright (C) Tim Potter 2001
|
||||
@ -527,7 +527,7 @@ struct winbindd_domain *find_auth_domain(uint8_t flags,
|
||||
if (lp_winbind_use_krb5_enterprise_principals()) {
|
||||
/*
|
||||
* If we use enterprise principals
|
||||
* we always go trough our primary domain
|
||||
* we always go through our primary domain
|
||||
* and follow the WRONG_REALM replies.
|
||||
*/
|
||||
flags &= ~WBFLAG_PAM_CONTACT_TRUSTDOM;
|
||||
@ -947,8 +947,8 @@ failed:
|
||||
}
|
||||
|
||||
/* we could have created a new credential cache with a valid tgt in it
|
||||
* but we werent able to get or verify the service ticket for this
|
||||
* local host and therefor didn't get the PAC, we need to remove that
|
||||
* but we weren't able to get or verify the service ticket for this
|
||||
* local host and therefore didn't get the PAC, we need to remove that
|
||||
* cache entirely now */
|
||||
|
||||
krb5_ret = ads_kdestroy(cc);
|
||||
@ -1249,7 +1249,7 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
|
||||
}
|
||||
|
||||
if (!(my_info3->base.acct_flags & ACB_NORMAL)) {
|
||||
DEBUG(0,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n",
|
||||
DEBUG(0,("winbindd_dual_pam_auth_cached: what's wrong with that one?: 0x%08x\n",
|
||||
my_info3->base.acct_flags));
|
||||
result = NT_STATUS_LOGON_FAILURE;
|
||||
goto out;
|
||||
@ -1891,7 +1891,7 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain,
|
||||
/*
|
||||
* Handle the case where a NT4 DC does not fill in the acct_flags in
|
||||
* the samlogon reply info3. Yes, in 2021, there are still admins
|
||||
* arround with real NT4 DCs.
|
||||
* around with real NT4 DCs.
|
||||
*
|
||||
* We used to call dcerpc_samr_QueryUserInfo(level=16) to fetch
|
||||
* acct_flags, but as NT4 DCs reject authentication with workstation
|
||||
@ -2339,7 +2339,7 @@ NTSTATUS _wbint_PamAuth(struct pipes_struct *p,
|
||||
}
|
||||
|
||||
/* there are quite some NT_STATUS errors where there is no
|
||||
* point in retrying with a samlogon, we explictly have to take
|
||||
* point in retrying with a samlogon, we explicitly have to take
|
||||
* care not to increase the bad logon counter on the DC */
|
||||
|
||||
if (NT_STATUS_EQUAL(result, NT_STATUS_ACCOUNT_DISABLED) ||
|
||||
|
@ -708,7 +708,7 @@ struct tevent_req *wb_seqnums_send(TALLOC_CTX *mem_ctx,
|
||||
struct tevent_context *ev);
|
||||
NTSTATUS wb_seqnums_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
|
||||
int *num_domains, struct winbindd_domain ***domains,
|
||||
NTSTATUS **stati, uint32_t **seqnums);
|
||||
NTSTATUS **statuses, uint32_t **seqnums);
|
||||
|
||||
struct tevent_req *winbindd_show_sequence_send(TALLOC_CTX *mem_ctx,
|
||||
struct tevent_context *ev,
|
||||
|
@ -134,7 +134,7 @@ static void cached_internal_pipe_close(
|
||||
* Freeing samr_pipes closes the cached pipes.
|
||||
*
|
||||
* We can do a hard close because at the time of this commit
|
||||
* we only use sychronous calls to external pipes. So we can't
|
||||
* we only use synchronous calls to external pipes. So we can't
|
||||
* have any outstanding requests. Also, we don't set
|
||||
* dcerpc_binding_handle_set_sync_ev in winbind, so we don't
|
||||
* get nested event loops. Once we start to get async in
|
||||
|
@ -27,7 +27,7 @@ struct winbindd_show_sequence_state {
|
||||
|
||||
/* All domains */
|
||||
int num_domains;
|
||||
NTSTATUS *stati;
|
||||
NTSTATUS *statuses;
|
||||
struct winbindd_domain **domains;
|
||||
uint32_t *seqnums;
|
||||
};
|
||||
@ -50,7 +50,7 @@ struct tevent_req *winbindd_show_sequence_send(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
state->one_domain = false;
|
||||
state->domains = NULL;
|
||||
state->stati = NULL;
|
||||
state->statuses = NULL;
|
||||
state->seqnums = NULL;
|
||||
|
||||
/* Ensure null termination */
|
||||
@ -112,7 +112,7 @@ static void winbindd_show_sequence_done_all(struct tevent_req *subreq)
|
||||
NTSTATUS status;
|
||||
|
||||
status = wb_seqnums_recv(subreq, state, &state->num_domains,
|
||||
&state->domains, &state->stati,
|
||||
&state->domains, &state->statuses,
|
||||
&state->seqnums);
|
||||
TALLOC_FREE(subreq);
|
||||
if (tevent_req_nterror(req, status)) {
|
||||
@ -145,7 +145,7 @@ NTSTATUS winbindd_show_sequence_recv(struct tevent_req *req,
|
||||
}
|
||||
|
||||
for (i=0; i<state->num_domains; i++) {
|
||||
if (!NT_STATUS_IS_OK(state->stati[i])
|
||||
if (!NT_STATUS_IS_OK(state->statuses[i])
|
||||
|| (state->seqnums[i] == DOM_SEQUENCE_NONE)) {
|
||||
extra_data = talloc_asprintf_append_buffer(
|
||||
extra_data, "%s : DISCONNECTED\n",
|
||||
|
@ -320,7 +320,7 @@ bool add_trusted_domain_from_auth(uint16_t validation_level,
|
||||
bool ok;
|
||||
|
||||
/*
|
||||
* We got a successfull auth from a domain that might not yet be in our
|
||||
* We got a successful auth from a domain that might not yet be in our
|
||||
* domain list. If we're a member we trust our DC who authenticated the
|
||||
* user from that domain and add the domain to our list on-the-fly. If
|
||||
* we're a DC we rely on configured trusts and don't add on-the-fly.
|
||||
|
Loading…
Reference in New Issue
Block a user