Merge from HEAD...setup the %U substitution in winbindd for the homedir template

Jeremy.
(This used to be commit efc4b738aef08604947dcc1ab5c6383e9ee6d783)

diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c
index 5ae2fe78702db255b0cc1cab9117fb52ac348b1f..06c95224ab9746971c808f6226b1cae9c7a2b55d 100644 (file)
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/nsswitch/winbindd_user.c
@@ -73,6 +73,7 @@ static BOOL winbindd_fill_pwent(char *dom_name, char *user_name,
           by lp_string() calling standard_sub_basic(). */
 
        fstrcpy(current_user_info.smb_name, user_name);
+       sub_set_smb_name(user_name);
        fstrcpy(current_user_info.domain, dom_name);
 
        pstrcpy(homedir, lp_template_homedir());