Changeset 140 for branches/samba-3.0/source/nsswitch/winbindd_util.c

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

File:

• branches/samba-3.0/source/nsswitch/winbindd_util.c (modified) (6 diffs)

branches/samba-3.0/source/nsswitch/winbindd_util.c

@@ -29 +29 @@
 
 extern struct winbindd_methods cache_methods;
-extern struct winbindd_methods passdb_methods;
+extern struct winbindd_methods builtin_passdb_methods;
+extern struct winbindd_methods sam_passdb_methods;
 
 /**
@@ -84 +85 @@
                 return False;
 
+        if ( IS_DC )
+                return sid_check_is_builtin(sid);
+
         return (sid_check_is_domain(sid) || sid_check_is_builtin(sid));
 }
@@ -91 +95 @@
         if (sid == NULL)
                 return False;
+
+        if ( IS_DC )
+                return sid_check_is_in_builtin(sid);
 
         return (sid_check_is_in_our_domain(sid) || sid_check_is_in_builtin(sid));
@@ -141 +148 @@
         ZERO_STRUCTP(domain);
 
-        /* prioritise the short name */
-        if (strchr_m(domain_name, '.') && alternative_name && *alternative_name) {
-                fstrcpy(domain->name, alternative_name);
-                fstrcpy(domain->alt_name, domain_name);
-        } else {
-                fstrcpy(domain->name, domain_name);
-                if (alternative_name) {
-                        fstrcpy(domain->alt_name, alternative_name);
-                }
+        fstrcpy(domain->name, domain_name);
+        if (alternative_name) {
+                fstrcpy(domain->alt_name, alternative_name);
         }
 
@@ -524 +525 @@
 
         domain = add_trusted_domain(get_global_sam_name(), NULL,
-                                    &passdb_methods, get_global_sam_sid());
+                                    &sam_passdb_methods, get_global_sam_sid());
         if ( role != ROLE_DOMAIN_MEMBER ) {
                 domain->primary = True;
@@ -532 +533 @@
         /* BUILTIN domain */
 
-        domain = add_trusted_domain("BUILTIN", NULL, &passdb_methods,
+        domain = add_trusted_domain("BUILTIN", NULL, &builtin_passdb_methods,
                                     &global_sid_Builtin);
         setup_domain_child(domain, &domain->child, NULL);