diff options
| author | Volker Lendecke <vl@samba.org> | 2008-04-22 15:41:25 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-04-22 15:42:09 +0200 |
| commit | 9ffcc7966f5bb5fb6f502580a0f5514568d18463 (patch) | |
| tree | ce091c117612ed2ab8538d48dddcade476da65d7 | |
| parent | 76b0db153dfdbbc5df4afda594bc4f3ba262e9a1 (diff) | |
| download | samba-9ffcc7966f5bb5fb6f502580a0f5514568d18463.tar.gz samba-9ffcc7966f5bb5fb6f502580a0f5514568d18463.tar.bz2 samba-9ffcc7966f5bb5fb6f502580a0f5514568d18463.zip | |
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)
| -rw-r--r-- | WHATSNEW.txt | 1 | ||||
| -rw-r--r-- | 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 <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 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); |