s3: rename sid_check_is_in_our_domain() to sid_check_is_in_our_sam()

This does not check whether the given sid is in our domain, but
but whether it belongs to the local sam, which is a different
thing on a domain member server.

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Thu Jul 12 18:36:02 CEST 2012 on sn-devel-104

6 files changed, 10 insertions, 10 deletions

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 9b2f548e55..8e14cec3e8 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1081,7 +1081,7 @@ static void legacy_gid_to_sid(struct dom_sid *psid, gid_t gid)
 static bool legacy_sid_to_unixid(const struct dom_sid *psid, struct unixid *id)
 {
 	GROUP_MAP *map;
-	if (sid_check_is_in_our_domain(psid)) {
+	if (sid_check_is_in_our_sam(psid)) {
 		bool ret;
 
 		become_root();
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index f3a4402d47..56edb171cb 100644
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -241,7 +241,7 @@ bool sid_check_is_our_sam(const struct dom_sid *sid)
  Check if the SID is our domain SID (S-1-5-21-x-y-z).
 *****************************************************************/  
 
-bool sid_check_is_in_our_domain(const struct dom_sid *sid)
+bool sid_check_is_in_our_sam(const struct dom_sid *sid)
 {
 	struct dom_sid dom_sid;
 
diff --git a/source3/passdb/machine_sid.h b/source3/passdb/machine_sid.h
index 2feada716d..33dce251a9 100644
--- a/source3/passdb/machine_sid.h
+++ b/source3/passdb/machine_sid.h
@@ -28,6 +28,6 @@
 struct dom_sid  *get_global_sam_sid(void);
 void reset_global_sam_sid(void) ;
 bool sid_check_is_our_sam(const struct dom_sid  *sid);
-bool sid_check_is_in_our_domain(const struct dom_sid  *sid);
+bool sid_check_is_in_our_sam(const struct dom_sid  *sid);
 
 #endif /* _PASSDB_MACHINE_SID_H_ */
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 71afb339fa..379d85803f 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -623,7 +623,7 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 		TALLOC_FREE(sam_account);
 
 		if (ret) {
-			if (!sid_check_is_in_our_domain(&user_sid)) {
+			if (!sid_check_is_in_our_sam(&user_sid)) {
 				DEBUG(0, ("User %s with invalid SID %s in passdb\n",
 					  name, sid_string_dbg(&user_sid)));
 				return False;
@@ -654,7 +654,7 @@ bool lookup_global_sam_name(const char *name, int flags, uint32_t *rid,
 	}
 
 	/* BUILTIN groups are looked up elsewhere */
-	if (!sid_check_is_in_our_domain(&map->sid)) {
+	if (!sid_check_is_in_our_sam(&map->sid)) {
 		DEBUG(10, ("Found group %s (%s) not in our domain -- "
 			   "ignoring.", name, sid_string_dbg(&map->sid)));
 		TALLOC_FREE(map);
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 30c13faebc..fee1e00231 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1607,7 +1607,7 @@ static NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
 
 		uid_to_sid(&sid, uids[i]);
 
-		if (!sid_check_is_in_our_domain(&sid)) {
+		if (!sid_check_is_in_our_sam(&sid)) {
 			DEBUG(5, ("Inconsistent SAM -- group member uid not "
 				  "in our domain\n"));
 			continue;
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 23793bf726..68ced934d3 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2724,7 +2724,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
 			if (!string_to_sid(&sid, sidstr))
 				goto done;
 
-			if (!sid_check_is_in_our_domain(&sid)) {
+			if (!sid_check_is_in_our_sam(&sid)) {
 				DEBUG(0, ("Inconsistent SAM -- group member uid not "
 					  "in our domain\n"));
 				ret = NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -3075,7 +3075,7 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
 		break;
 
 	case SID_NAME_ALIAS:
-		if (!sid_check_is_in_our_domain(&map->sid) 
+		if (!sid_check_is_in_our_sam(&map->sid) 
 			&& !sid_check_is_in_builtin(&map->sid) ) 
 		{
 			DEBUG(3, ("Refusing to map sid %s as an alias, not in our domain\n",
@@ -3487,7 +3487,7 @@ static NTSTATUS ldapsam_modify_aliasmem(struct pdb_methods *methods,
 		type = SID_NAME_ALIAS;
 	}
 
-	if (sid_check_is_in_our_domain(alias)) {
+	if (sid_check_is_in_our_sam(alias)) {
 		type = SID_NAME_ALIAS;
 	}
 
@@ -3610,7 +3610,7 @@ static NTSTATUS ldapsam_enum_aliasmem(struct pdb_methods *methods,
 		type = SID_NAME_ALIAS;
 	}
 
-	if (sid_check_is_in_our_domain(alias)) {
+	if (sid_check_is_in_our_sam(alias)) {
 		type = SID_NAME_ALIAS;
 	}