From 4a79c126dbfc71cc7d796f012b1f4ddd63da6603 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 13 Feb 2007 10:42:53 +0000 Subject: r21308: Fix some typos and ensure to null terminate the correct strings. Guenther --- source/nsswitch/winbindd_async.c | 8 ++++---- source/nsswitch/winbindd_rpc.c | 2 +- source/nsswitch/winbindd_util.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/nsswitch/winbindd_async.c b/source/nsswitch/winbindd_async.c index ee81b14f2f5..1b357165e30 100644 --- a/source/nsswitch/winbindd_async.c +++ b/source/nsswitch/winbindd_async.c @@ -837,7 +837,7 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, BOOL success, char *name_domain, *name_account; if ( !root_domain ) { - DEBUG(5,("lookupname_recv: unable determine forest root\n")); + DEBUG(5,("lookupname_recv: unable to determine forest root\n")); cont(private_data, False, NULL, SID_NAME_UNKNOWN); return; } @@ -907,10 +907,10 @@ enum winbindd_result winbindd_dual_lookupname(struct winbindd_domain *domain, char *p; /* Ensure null termination */ - state->request.data.sid[sizeof(state->request.data.name.dom_name)-1]='\0'; + state->request.data.name.dom_name[sizeof(state->request.data.name.dom_name)-1]='\0'; /* Ensure null termination */ - state->request.data.sid[sizeof(state->request.data.name.name)-1]='\0'; + state->request.data.name.name[sizeof(state->request.data.name.name)-1]='\0'; /* cope with the name being a fully qualified name */ p = strstr(state->request.data.name.name, lp_winbind_separator()); @@ -926,7 +926,7 @@ enum winbindd_result winbindd_dual_lookupname(struct winbindd_domain *domain, DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid, name_domain, lp_winbind_separator(), name_user)); - /* Lookup name from PDC using lsa_lookup_names() */ + /* Lookup name from DC using lsa_lookup_names() */ if (!winbindd_lookup_sid_by_name(state->mem_ctx, domain, name_domain, name_user, &sid, &type)) { return WINBINDD_ERROR; diff --git a/source/nsswitch/winbindd_rpc.c b/source/nsswitch/winbindd_rpc.c index 6952c7717c7..c3d70660987 100644 --- a/source/nsswitch/winbindd_rpc.c +++ b/source/nsswitch/winbindd_rpc.c @@ -262,7 +262,7 @@ NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain, return NT_STATUS_NO_MEMORY; } - ws_name_return( full_name, '_' ); + ws_name_return( full_name, '_' ); DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", full_name?full_name:"", domain_name )); diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c index 85d5f3443a4..72c85a9c6a4 100644 --- a/source/nsswitch/winbindd_util.c +++ b/source/nsswitch/winbindd_util.c @@ -716,7 +716,7 @@ BOOL winbindd_lookup_sid_by_name(TALLOC_CTX *mem_ctx, /* Lookup name */ result = domain->methods->name_to_sid(domain, mem_ctx, domain_name, name, sid, type); - /* Return rid and type if lookup successful */ + /* Return sid and type if lookup successful */ if (!NT_STATUS_IS_OK(result)) { *type = SID_NAME_UNKNOWN; } -- cgit