Fix wbinfo --group-info if the winbind separator set to non \

In getgrsid_lookupsid_recv() we use parse_domain_user which itself looks at
lp_winbind_separator(). Thus when building up that group name we should better
use it as well.
(This used to be commit 5df75578ef1da41164936cd11b14114889201d47)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 001f0f8d70f881e22182d6290321b601f702e1bc..364b3fea21ff75590899d5f11a47cf65ac1bd32e 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -292,6 +292,7 @@ o   Volker Lendecke <vl@samba.org>
     * Make winbind use NetSamLogonEx when possible.
     * Merge fixes in the 3-0-ctdb cluster code.
     * Fix a segfault in snprintf replacement code.
+    * Fix a regression for wbinfo --group-info if winbind separator is set
 
 
 o   Derrell Lipman <derrell@samba.org>

diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
index d5d3accec10d452055c5354ae8b5c2e5fa5f65f9..63fde9f495d11e08c879e8b5e83c8b41195a5733 100644 (file)
--- a/source3/winbindd/winbindd_group.c
+++ b/source3/winbindd/winbindd_group.c
@@ -806,8 +806,10 @@ static void getgrsid_lookupsid_recv( void *private_data, bool success,
 }
 
        if ( (s->group_name = talloc_asprintf( s->state->mem_ctx, 
-                                              "%s\\%s", 
-                                              dom_name, name )) == NULL )
+                                               "%s%c%s",
+                                               dom_name,
+                                              *lp_winbind_separator(),
+                                               name)) == NULL )
 {
                DEBUG(1, ("getgrsid_lookupsid_recv: talloc_asprintf() Failed!\n"));
                request_error(s->state);