sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

winbind: Fix template homedir to match source3

Browse Source 
Fix provided by Andy Igoshin <ai@vsu.ru>

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10324

Andrew Bartlett

Change-Id: Ie94d207fed91e9dfd85ee3c3339c376b25ac5fa4
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2014-03-28 16:32:06 +13:00
parent 67a9d2183e
commit 57228317fc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/loadparm.c
View File

@ -2294,7 +2294,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter_var(lp_ctx, "samba kcc command", lpcfg_do_global_parameter_var(lp_ctx, "samba kcc command",
"%s/samba_kcc", dyn_SCRIPTSBINDIR); "%s/samba_kcc", dyn_SCRIPTSBINDIR);
lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false"); 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, "client signing", "default");
lpcfg_do_global_parameter(lp_ctx, "server signing", "default"); lpcfg_do_global_parameter(lp_ctx, "server signing", "default");

4
source4/winbind/wb_cmd_getpwnam.c
View File

@ -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_gecos, user_info->out.full_name);
WBSRV_SAMBA3_SET_STRING(pw->pw_dir, WBSRV_SAMBA3_SET_STRING(pw->pw_dir,
lpcfg_template_homedir(state->service->task->lp_ctx)); 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); 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); sizeof(fstring) - 1);
WBSRV_SAMBA3_SET_STRING(pw->pw_shell, WBSRV_SAMBA3_SET_STRING(pw->pw_shell,
lpcfg_template_shell(state->service->task->lp_ctx)); lpcfg_template_shell(state->service->task->lp_ctx));

4
source4/winbind/wb_cmd_getpwuid.c
View File

@ -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_gecos, user_info->out.full_name);
WBSRV_SAMBA3_SET_STRING(pw->pw_dir, WBSRV_SAMBA3_SET_STRING(pw->pw_dir,
lpcfg_template_homedir(state->service->task->lp_ctx)); 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); 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); sizeof(fstring) - 1);
WBSRV_SAMBA3_SET_STRING(pw->pw_shell, WBSRV_SAMBA3_SET_STRING(pw->pw_shell,
lpcfg_template_shell(state->service->task->lp_ctx)); lpcfg_template_shell(state->service->task->lp_ctx));