Changeset 862 for trunk/server/source3/auth/auth_util.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/auth/auth_util.c (modified) (4 diffs)

trunk/server/source3/auth/auth_util.c

@@ -121 +121 @@
 
         if (!is_trusted_domain(domain) &&
-            !strequal(domain, my_sam_name()))
+            !strequal(domain, my_sam_name()) &&
+            !strequal(domain, get_global_sam_name()))
         {
                 if (lp_map_untrusted_to_domain())
@@ -902 +903 @@
 NTSTATUS make_serverinfo_from_username(TALLOC_CTX *mem_ctx,
                                        const char *username,
+                                       bool use_guest_token,
                                        bool is_guest,
                                        struct auth_serversupplied_info **presult)
@@ -925 +927 @@
         result->guest = is_guest;
 
-        status = create_local_token(result);
+        if (use_guest_token) {
+                status = make_server_info_guest(mem_ctx, &result);
+        } else {
+                status = create_local_token(result);
+        }
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -1175 +1181 @@
                         /* work around 'winbind use default domain = yes' */
 
-                        if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
+                        if ( lp_winbind_use_default_domain() &&
+                             !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
                                 char *domain;