diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-07-16 09:48:23 -0400 |
|---|---|---|
| committer | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-07-16 09:48:23 -0400 |
| commit | db7bff1babdb556efa54b7ff02d66fb50e833a30 (patch) | |
| tree | fc436d46a35ce503234aa20d60349795f8d28408 /source3/groupdb/mapping.c | |
| parent | deac1761f0695053dec3557e06be5d53e7d189e2 (diff) | |
| parent | ddc0d9deb32082a5d8d591800d638d0e96fa6ff3 (diff) | |
| download | samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.tar.gz samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.tar.bz2 samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
(This used to be commit 11d74fc51c637b8129304b5de85bbe02a86a69ce)
Diffstat (limited to 'source3/groupdb/mapping.c')
| -rw-r--r-- | source3/groupdb/mapping.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index ce66bfa64f..b952cda523 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -297,9 +297,12 @@ int smb_set_primary_group(const char *unix_group, const char* unix_user) return -1; } add_script = talloc_all_string_sub(ctx, - add_script, - "%g", - unix_group); + add_script, "%g", unix_group); + if (!add_script) { + return -1; + } + add_script = talloc_string_sub(ctx, + add_script, "%u", unix_user); if (!add_script) { return -1; } |