[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3215-gc4a137e

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  c4a137e9789b06047ce53e5828fb5e1bb76aca06 (commit)
      from  37c64130701ab13b6f34998ac17fec2d128c2e08 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit c4a137e9789b06047ce53e5828fb5e1bb76aca06
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jul 14 12:40:33 2008 -0700

    Add fix from Simo for bug #5540 - missing code to substitute
    %u. Make this the same as other uses.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/groupdb/mapping.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/groupdb/mapping.c b/source/groupdb/mapping.c
index ce66bfa..b952cda 100644
--- a/source/groupdb/mapping.c
+++ b/source/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;
 		}


-- 
Samba Shared Repository