Changeset 596 for trunk/server/source3/winbindd/idmap_util.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/winbindd/idmap_util.c (modified) (3 diffs)

trunk/server/source3/winbindd/idmap_util.c

@@ -24 +24 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
+
+/*****************************************************************
+ Returns true if the request was for a specific domain, or
+ for a sid we are authoritative for - BUILTIN, or our own domain.
+*****************************************************************/
+
+static bool is_specific_domain_request(const char *dom_name, DOM_SID *sid)
+{
+        if (dom_name && dom_name[0] != '\0') {
+                return true;
+        }
+        if (sid_check_is_in_builtin(sid) ||
+                        sid_check_is_in_our_domain(sid)) {
+                return true;
+        }
+        return false;
+}
 
 /*****************************************************************
@@ -195 +212 @@
         }
 
-        if (dom_name[0] != '\0') {
+        if (is_specific_domain_request(dom_name, sid)) {
                 /*
-                 * We had the task to go to a specific domain which
-                 * could not answer our request. Fail.
+                 * We had the task to go to a specific domain or
+                 * a domain for which we are authoritative for and
+                 * it could not answer our request. Fail.
                  */
                 if (winbindd_use_idmap_cache()) {
@@ -276 +294 @@
         }
 
-        if (domname[0] != '\0') {
+        if (is_specific_domain_request(domname, sid)) {
                 /*
-                 * We had the task to go to a specific domain which
-                 * could not answer our request. Fail.
+                 * We had the task to go to a specific domain or
+                 * a domain for which we are authoritative for and
+                 * it could not answer our request. Fail.
                  */
                 if (winbindd_use_idmap_cache()) {