1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00

Add function is_dc_trusted_domain_situation().

This is like is_trusted_domain_situation() except that it does not
check for lp_allow_trusted_domains().

Michael
(This used to be commit a284c8843528972904d142b573f1170a08c97751)
This commit is contained in:
Michael Adam 2008-05-26 12:05:21 +02:00
parent 09f55d0ef6
commit 4de01a909a
2 changed files with 8 additions and 3 deletions

View File

@ -6271,6 +6271,7 @@ bool pdb_copy_sam_account(struct samu *dst, struct samu *src );
bool pdb_update_bad_password_count(struct samu *sampass, bool *updated);
bool pdb_update_autolock_flag(struct samu *sampass, bool *updated);
bool pdb_increment_bad_password_count(struct samu *sampass);
bool is_dc_trusted_domain_situation(const char *domain_name);
bool is_trusted_domain_situation(const char *domain_name);
bool get_trust_pw_clear(const char *domain, char **ret_pwd,
const char **account_name, uint32 *channel);

View File

@ -1517,11 +1517,15 @@ bool pdb_increment_bad_password_count(struct samu *sampass)
return True;
}
bool is_dc_trusted_domain_situation(const char *domain_name)
{
return IS_DC && !strequal(domain_name, lp_workgroup());
}
bool is_trusted_domain_situation(const char *domain_name)
{
return IS_DC &&
lp_allow_trusted_domains() &&
!strequal(domain_name, lp_workgroup());
return is_dc_trusted_domain_situation(domain_name) &&
lp_allow_trusted_domains();
}
/*******************************************************************