From 9ffcc7966f5bb5fb6f502580a0f5514568d18463 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 22 Apr 2008 15:41:25 +0200 Subject: 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) --- WHATSNEW.txt | 1 + source3/winbindd/winbindd_group.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 001f0f8d70..364b3fea21 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -292,6 +292,7 @@ o Volker Lendecke * 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 diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c index d5d3accec1..63fde9f495 100644 --- 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); -- cgit