s3: Use sid_check_is_in_our_domain instead of a direct sid_peek_check_rid
authorVolker Lendecke <vl@samba.org>
Sun, 10 Jan 2010 16:57:00 +0000 (17:57 +0100)
committerVolker Lendecke <vl@samba.org>
Sun, 10 Jan 2010 19:56:16 +0000 (20:56 +0100)
source3/passdb/lookup_sid.c

index 4421d89c3aed4072e7f8d0384a0f65fd1e59cb97..6149f974ac044cefe5d4e6ade1da0d850841754b 100644 (file)
@@ -1187,9 +1187,8 @@ static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
 static bool legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
 {
        enum lsa_SidType type;
-       uint32 rid;
 
-       if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
+       if (sid_check_is_in_our_domain(psid)) {
                union unid_t id;
                bool ret;
 
@@ -1230,7 +1229,6 @@ done:
 
 static bool legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
 {
-       uint32 rid;
        GROUP_MAP map;
        union unid_t id;
        enum lsa_SidType type;
@@ -1252,7 +1250,7 @@ static bool legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
                return false;
        }
 
-       if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) {
+       if (sid_check_is_in_our_domain(psid)) {
                bool ret;
 
                become_root();