From: Michael Adam <obnox@samba.org>
Date: Mon, 26 May 2008 10:05:21 +0000 (+0200)
Subject: Add function is_dc_trusted_domain_situation().
X-Git-Tag: samba-4.0.0alpha6~801^2~1263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4de01a909a0b632775866866ca0042a25cb5495e;p=thirdparty%2Fsamba.git

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)
---

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3d72022b9a8..0c770d866c2 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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);
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index e3a3d3ca9e5..2df2a9c3ce9 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -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();
 }
 
 /*******************************************************************