Changeset 989 for vendor/current/source3/lib/substitute.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/lib/substitute.c (modified) (2 diffs)

vendor/current/source3/lib/substitute.c

@@ -500 +500 @@
                 case 'G' : {
                         struct passwd *pass;
+                        bool is_domain_name = false;
+                        const char *sep = lp_winbind_separator();
 
                         if (domain_name != NULL && domain_name[0] != '\0' &&
-                            !strequal(domain_name, my_sam_name()))
-                        {
+                            (lp_security() == SEC_ADS ||
+                             lp_security() == SEC_DOMAIN)) {
                                 r = talloc_asprintf(tmp_ctx,
                                                     "%s%c%s",
                                                     domain_name,
-                                                    *lp_winbind_separator(),
+                                                    *sep,
                                                     smb_name);
+                                is_domain_name = true;
                         } else {
                                 r = talloc_strdup(tmp_ctx, smb_name);
@@ -518 +521 @@
                         pass = Get_Pwnam_alloc(tmp_ctx, r);
                         if (pass != NULL) {
-                                a_string = realloc_string_sub(
-                                        a_string, "%G",
-                                        gidtoname(pass->pw_gid));
+                                char *group_name;
+
+                                group_name = gidtoname(pass->pw_gid);
+                                if (is_domain_name) {
+                                        p = strchr_m(group_name, *sep);
+                                        if (p != NULL) {
+                                                group_name = p + 1;
+                                        }
+                                }
+                                a_string = realloc_string_sub(a_string,
+                                                              "%G",
+                                                              group_name);
                         }
                         TALLOC_FREE(pass);