s3-lib: Fix %G substitution for domain users in smbd

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10286
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Christian Ambach <ambi@samba.org>
Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Tue Dec 10 16:39:43 CET 2013 on sn-devel-104

(cherry picked from commit 8eef4ab79ec5fb7e96ad2f2ad6c9bf30db13a50d)
Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Sat Dec 14 23:47:20 CET 2013 on sn-devel-104

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index ca2ac7981fad5fc9b7583a5ac48ae30d62517cc1..937f02c4994892761883110644c94c9a132abb70 100644 (file)
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -499,10 +499,20 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
                        break;
                case 'G' : {
                        struct passwd *pass;
-                       r = talloc_strdup(tmp_ctx, smb_name);
+
+                       if (domain_name != NULL && domain_name[0] != '\0') {
+                               r = talloc_asprintf(tmp_ctx,
+                                                   "%s%c%s",
+                                                   domain_name,
+                                                   *lp_winbind_separator(),
+                                                   smb_name);
+                       } else {
+                               r = talloc_strdup(tmp_ctx, smb_name);
+                       }
                        if (r == NULL) {
                                goto error;
                        }
+
                        pass = Get_Pwnam_alloc(tmp_ctx, r);
                        if (pass != NULL) {
                                a_string = realloc_string_sub(