1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-15 16:23:49 +03:00

r12051: Merge across the lookup_name and lookup_sid work. Lets see how the build farm

reacts :-)

Volker
This commit is contained in:
Volker Lendecke
2005-12-03 18:34:13 +00:00
committed by Gerald (Jerry) Carter
parent b9d1a65910
commit 9f99d04a54
19 changed files with 1001 additions and 616 deletions

View File

@@ -1550,7 +1550,7 @@ NT_USER_TOKEN *dup_nt_token(NT_USER_TOKEN *ptoken)
Check for a SID in an NT_USER_TOKEN
****************************************************************************/
BOOL nt_token_check_sid ( DOM_SID *sid, NT_USER_TOKEN *token )
static BOOL nt_token_check_sid ( DOM_SID *sid, NT_USER_TOKEN *token )
{
int i;
@@ -1598,8 +1598,6 @@ BOOL nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
BOOL is_trusted_domain(const char* dom_name)
{
DOM_SID trustdom_sid;
char *pass = NULL;
time_t lct;
BOOL ret;
/* no trusted domains for a standalone server */
@@ -1613,9 +1611,8 @@ BOOL is_trusted_domain(const char* dom_name)
become_root();
DEBUG (5,("is_trusted_domain: Checking for domain trust with [%s]\n",
dom_name ));
ret = secrets_fetch_trusted_domain_password(dom_name, &pass, &trustdom_sid, &lct);
ret = secrets_fetch_trusted_domain_password(dom_name, NULL, NULL, NULL);
unbecome_root();
SAFE_FREE(pass);
if (ret)
return True;
}