From 57228317fc2339b83cccf4b1f3515d8a3b435a3c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 28 Mar 2014 16:32:06 +1300 Subject: [PATCH] winbind: Fix template homedir to match source3 Fix provided by Andy Igoshin BUG: https://bugzilla.samba.org/show_bug.cgi?id=10324 Andrew Bartlett Change-Id: Ie94d207fed91e9dfd85ee3c3339c376b25ac5fa4 Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- lib/param/loadparm.c | 2 +- source4/winbind/wb_cmd_getpwnam.c | 4 ++-- source4/winbind/wb_cmd_getpwuid.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index bf0cbc0e9d9..5a0ef8824a1 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2294,7 +2294,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter_var(lp_ctx, "samba kcc command", "%s/samba_kcc", dyn_SCRIPTSBINDIR); lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false"); - lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%"); + lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%D/%U"); lpcfg_do_global_parameter(lp_ctx, "client signing", "default"); lpcfg_do_global_parameter(lp_ctx, "server signing", "default"); diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c index 0101d8ca23f..c4f3db8df68 100644 --- a/source4/winbind/wb_cmd_getpwnam.c +++ b/source4/winbind/wb_cmd_getpwnam.c @@ -133,9 +133,9 @@ static void cmd_getpwnam_recv_user_info(struct composite_context *ctx) WBSRV_SAMBA3_SET_STRING(pw->pw_gecos, user_info->out.full_name); WBSRV_SAMBA3_SET_STRING(pw->pw_dir, lpcfg_template_homedir(state->service->task->lp_ctx)); - all_string_sub(pw->pw_dir, "%WORKGROUP%", state->workgroup_name, + all_string_sub(pw->pw_dir, "%D", state->workgroup_name, sizeof(fstring) - 1); - all_string_sub(pw->pw_dir, "%ACCOUNTNAME%", user_info->out.account_name, + all_string_sub(pw->pw_dir, "%U", user_info->out.account_name, sizeof(fstring) - 1); WBSRV_SAMBA3_SET_STRING(pw->pw_shell, lpcfg_template_shell(state->service->task->lp_ctx)); diff --git a/source4/winbind/wb_cmd_getpwuid.c b/source4/winbind/wb_cmd_getpwuid.c index 73bbb59bc3d..997776760cf 100644 --- a/source4/winbind/wb_cmd_getpwuid.c +++ b/source4/winbind/wb_cmd_getpwuid.c @@ -153,9 +153,9 @@ static void cmd_getpwuid_recv_user_info(struct composite_context *ctx) WBSRV_SAMBA3_SET_STRING(pw->pw_gecos, user_info->out.full_name); WBSRV_SAMBA3_SET_STRING(pw->pw_dir, lpcfg_template_homedir(state->service->task->lp_ctx)); - all_string_sub(pw->pw_dir, "%WORKGROUP%", state->workgroup, + all_string_sub(pw->pw_dir, "%D", state->workgroup, sizeof(fstring) - 1); - all_string_sub(pw->pw_dir, "%ACCOUNTNAME%", user_info->out.account_name, + all_string_sub(pw->pw_dir, "%U", user_info->out.account_name, sizeof(fstring) - 1); WBSRV_SAMBA3_SET_STRING(pw->pw_shell, lpcfg_template_shell(state->service->task->lp_ctx)); -- 2.11.4.GIT