sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r7243: Don't look at gencache.tdb for the trusted domains if winbind is around.

Browse Source 
Volker
(This used to be commit 94acb93f57)
This commit is contained in:
Volker Lendecke 2005-06-03 15:42:03 +00:00 committed by Gerald (Jerry) Carter
parent a01de91394
commit 5084d49052
3 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/auth/auth_util.c
View File

@ -1532,10 +1532,25 @@ BOOL is_trusted_domain(const char* dom_name)
return True;
}
else {
/* if winbindd is not up and we are a domain member) then we need to update the
trustdom_cache ourselves */
NSS_STATUS result;
/* If winbind is around, ask it */
result = wb_is_trusted_domain(dom_name);
if (result == NSS_STATUS_SUCCESS) {
return True;
}
if (result == NSS_STATUS_NOTFOUND) {
/* winbind could not find the domain */
return False;
}
/* The only other possible result is that winbind is not up
and running. We need to update the trustdom_cache
ourselves */
if ( !winbind_ping() )
update_trustdom_cache();
}

31
source3/nsswitch/wb_client.c
View File

@ -394,4 +394,35 @@ BOOL winbind_ping( void )
return result == NSS_STATUS_SUCCESS;
}
/**********************************************************************
Is a domain trusted?
result == NSS_STATUS_UNAVAIL: winbind not around
result == NSS_STATUS_NOTFOUND: winbind around, but domain missing
Due to a bad API NSS_STATUS_NOTFOUND is returned both when winbind_off and
when winbind return WINBINDD_ERROR. So the semantics of this routine depends
on winbind_on. Grepping for winbind_off I just found 3 places where winbind
is turned off, and this does not conflict (as far as I have seen) with the
callers of is_trusted_domains.
I *hate* global variables....
Volker
**********************************************************************/
NSS_STATUS wb_is_trusted_domain(const char *domain)
{
struct winbindd_request request;
struct winbindd_response response;
/* Call winbindd */
ZERO_STRUCT(request);
ZERO_STRUCT(response);
fstrcpy(request.domain_name, domain);
return winbindd_request(WINBINDD_DOMAIN_INFO, &request, &response);
}

2
source3/script/mkproto.awk
View File

@ -132,7 +132,7 @@ END {
gotstart = 1;
}
if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2|^LOGIN_CACHE|^krb5_error_code|^LDAP|^u32|^LUID_ATTR/ ) {
if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2|^LOGIN_CACHE|^krb5_error_code|^LDAP|^u32|^LUID_ATTR|^NSS_STATUS/ ) {
gotstart = 1;
}