diff options
| author | Gerald Carter <jerry@samba.org> | 2004-04-20 02:37:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:17 -0500 |
| commit | f7cf0aaa6f5cb10f2a52b2b76efc0e4dbe6bea91 (patch) | |
| tree | c6f53f29576d7e8cf96233c768cfa3dd3d932215 /source3/nsswitch/winbindd_sid.c | |
| parent | 1f7900ebda8a89f71a6e7293b151effbc6c86d6f (diff) | |
| download | samba-f7cf0aaa6f5cb10f2a52b2b76efc0e4dbe6bea91.tar.gz samba-f7cf0aaa6f5cb10f2a52b2b76efc0e4dbe6bea91.tar.bz2 samba-f7cf0aaa6f5cb10f2a52b2b76efc0e4dbe6bea91.zip | |
r294: checking in volker's winbindd patches; tested on domain members (Samba and AD) as well as on a Samba DC
(This used to be commit 157d53782d6a7d0b7e30676a674ff2a25a15369c)
Diffstat (limited to 'source3/nsswitch/winbindd_sid.c')
| -rw-r--r-- | source3/nsswitch/winbindd_sid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_sid.c b/source3/nsswitch/winbindd_sid.c index d4206558c5..61da9b3d92 100644 --- a/source3/nsswitch/winbindd_sid.c +++ b/source3/nsswitch/winbindd_sid.c @@ -95,14 +95,14 @@ enum winbindd_result winbindd_lookupname(struct winbindd_cli_state *state) DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid, name_domain, lp_winbind_separator(), name_user)); - if ((domain = find_domain_from_name(name_domain)) == NULL) { + if ((domain = find_lookup_domain_from_name(name_domain)) == NULL) { DEBUG(0, ("could not find domain entry for domain %s\n", name_domain)); return WINBINDD_ERROR; } /* Lookup name from PDC using lsa_lookup_names() */ - if (!winbindd_lookup_sid_by_name(domain, name_user, &sid, &type)) { + if (!winbindd_lookup_sid_by_name(domain, name_domain, name_user, &sid, &type)) { return WINBINDD_ERROR; } @@ -335,7 +335,7 @@ enum winbindd_result winbindd_uid_to_sid(struct winbindd_cli_state *state) return WINBINDD_ERROR; } - if ( !winbindd_lookup_sid_by_name(domain, pw->pw_name, &sid, &type) ) + if ( !winbindd_lookup_sid_by_name(domain, domain->name, pw->pw_name, &sid, &type) ) return WINBINDD_ERROR; if ( type != SID_NAME_USER ) @@ -405,7 +405,7 @@ enum winbindd_result winbindd_gid_to_sid(struct winbindd_cli_state *state) return WINBINDD_ERROR; } - if ( !winbindd_lookup_sid_by_name(domain, grp->gr_name, &sid, &type) ) + if ( !winbindd_lookup_sid_by_name(domain, domain->name, grp->gr_name, &sid, &type) ) return WINBINDD_ERROR; if ( type!=SID_NAME_DOM_GRP && type!=SID_NAME_ALIAS ) |