diff options
| author | Gerald Carter <jerry@samba.org> | 2005-06-10 03:26:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:09 -0500 |
| commit | 1dfe111a09ea269d84b10743ad9c2a4e335d7c88 (patch) | |
| tree | 8ba6696814a25aaf1dfc838d91dfc8ca06273abb /source3/nsswitch/winbindd_user.c | |
| parent | 6d39f3bdce5ba8ed7d88a430a2de9f96d4b2c513 (diff) | |
| download | samba-1dfe111a09ea269d84b10743ad9c2a4e335d7c88.tar.gz samba-1dfe111a09ea269d84b10743ad9c2a4e335d7c88.tar.bz2 samba-1dfe111a09ea269d84b10743ad9c2a4e335d7c88.zip | |
r7454: couple of winbindd fixes
* make sure to use our domain as the account name in the net_req_auth2()
request when running on a Samba DC
* make sure to lookup the correct domain (not default to ours) when getting an async
getpwnam() call
(This used to be commit c9c3e3c122a6a04847c448d298b6f1adb4f35a60)
Diffstat (limited to 'source3/nsswitch/winbindd_user.c')
| -rw-r--r-- | source3/nsswitch/winbindd_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c index d192793993..d8d7dbb502 100644 --- a/source3/nsswitch/winbindd_user.c +++ b/source3/nsswitch/winbindd_user.c @@ -324,7 +324,7 @@ enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state) /* Get info for the domain */ - domain = find_lookup_domain_from_name(domname); + domain = find_domain_from_name(domname); if (domain == NULL) { DEBUG(7, ("could not find domain entry for domain %s\n", @@ -332,9 +332,9 @@ enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state) return WINBINDD_ERROR; } - if ( domain->primary && lp_winbind_trusted_domains_only()) { - DEBUG(7,("winbindd_getpwnam: My domain -- rejecting " - "getgroups() for %s\\%s.\n", domname, username)); + if ( strequal(domname, lp_workgroup()) && lp_winbind_trusted_domains_only() ) { + DEBUG(7,("winbindd_getpwnam: My domain -- rejecting getpwnam() for %s\\%s.\n", + domname, username)); return WINBINDD_ERROR; } |