Changeset 124 for branches/samba-3.0/source/passdb/lookup_sid.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/passdb/lookup_sid.c (modified) (11 diffs)

branches/samba-3.0/source/passdb/lookup_sid.c

@@ -61 +61 @@
         }
 
-        DEBUG(10,("lookup_name: %s => %s (domain), %s (name)\n", 
-                full_name, domain, name));
-
         if ((domain == NULL) || (name == NULL)) {
                 DEBUG(0, ("talloc failed\n"));
@@ -70 +67 @@
         }
 
-        if (strequal(domain, get_global_sam_name())) {
+        DEBUG(10,("lookup_name: %s => %s (domain), %s (name)\n",
+                full_name, domain, name));
+        DEBUG(10, ("lookup_name: flags = 0x0%x\n", flags));
+
+        if ((flags & LOOKUP_NAME_DOMAIN) &&
+            strequal(domain, get_global_sam_name()))
+        {
 
                 /* It's our own domain, lookup the name in passdb */
@@ -82 +85 @@
         }
 
-        if (strequal(domain, builtin_domain_name())) {
-
+        if ((flags & LOOKUP_NAME_BUILTIN) &&
+            strequal(domain, builtin_domain_name()))
+        {
                 /* Explicit request for a name in BUILTIN */
                 if (lookup_builtin_name(name, &rid)) {
@@ -99 +103 @@
 
         if ((domain[0] != '\0') &&
+            (flags & ~(LOOKUP_NAME_DOMAIN|LOOKUP_NAME_ISOLATED)) &&
             (winbind_lookup_name(domain, name, &sid, &type))) {
                         goto ok;
@@ -133 +138 @@
         /* 1. well-known names */
 
-        if (lookup_wellknown_name(tmp_ctx, name, &sid, &domain)) {
+        if ((flags & LOOKUP_NAME_WKN) &&
+            lookup_wellknown_name(tmp_ctx, name, &sid, &domain))
+        {
                 type = SID_NAME_WKN_GRP;
                 goto ok;
@@ -140 +147 @@
         /* 2. Builtin domain as such */
 
-        if (strequal(name, builtin_domain_name())) {
+        if ((flags & (LOOKUP_NAME_BUILTIN|LOOKUP_NAME_REMOTE)) &&
+            strequal(name, builtin_domain_name()))
+        {
                 /* Swap domain and name */
                 tmp = name; name = domain; domain = tmp;
@@ -150 +159 @@
         /* 3. Account domain */
 
-        if (strequal(name, get_global_sam_name())) {
+        if ((flags & LOOKUP_NAME_DOMAIN) &&
+            strequal(name, get_global_sam_name()))
+        {
                 if (!secrets_fetch_domain_sid(name, &sid)) {
                         DEBUG(3, ("Could not fetch my SID\n"));
@@ -164 +175 @@
         /* 4. Primary domain */
 
-        if (!IS_DC && strequal(name, lp_workgroup())) {
+        if ((flags & LOOKUP_NAME_DOMAIN) && !IS_DC &&
+            strequal(name, lp_workgroup()))
+        {
                 if (!secrets_fetch_domain_sid(name, &sid)) {
                         DEBUG(3, ("Could not fetch the domain SID\n"));
@@ -179 +192 @@
               this, tested an XP workstation in a NT domain -- vl */
 
-        if (IS_DC && (secrets_fetch_trusted_domain_password(name, NULL,
-                                                            &sid, NULL))) {
+        if ((flags & LOOKUP_NAME_REMOTE) && IS_DC &&
+            (secrets_fetch_trusted_domain_password(name, NULL, &sid, NULL)))
+        {
                 /* Swap domain and name */
                 tmp = name; name = domain; domain = tmp;
@@ -189 +203 @@
         /* 6. Builtin aliases */        
 
-        if (lookup_builtin_name(name, &rid)) {
+        if ((flags & LOOKUP_NAME_BUILTIN) &&
+            lookup_builtin_name(name, &rid))
+        {
                 domain = talloc_strdup(tmp_ctx, builtin_domain_name());
                 sid_copy(&sid, &global_sid_Builtin);
@@ -202 +218 @@
         /* Both cases are done by looking at our passdb */
 
-        if (lookup_global_sam_name(name, flags, &rid, &type)) {
+        if ((flags & LOOKUP_NAME_DOMAIN) &&
+            lookup_global_sam_name(name, flags, &rid, &type))
+        {
                 domain = talloc_strdup(tmp_ctx, get_global_sam_name());
                 sid_copy(&sid, get_global_sam_sid());