Attachment 9526 Details for Bug 10324 – fix for this big

[patch] fix for this big

template_homedir_substitution.diff (text/plain), 2.42 KB, created by Andy Igoshin on 2013-12-14 15:51:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Igoshin

Created: 2013-12-14 15:51:45 UTC

Size: 2.42 KB

patch

obsolete

>diff -ur samba-4.1.2.ORIG/lib/param/loadparm.c samba-4.1.2/lib/param/loadparm.c
>--- samba-4.1.2.ORIG/lib/param/loadparm.c	2013-08-09 11:12:25.000000000 +0400
>+++ samba-4.1.2/lib/param/loadparm.c	2013-12-14 18:38:42.891597866 +0400
>@@ -2192,7 +2192,7 @@
> 	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 -ur samba-4.1.2.ORIG/source4/winbind/wb_cmd_getpwnam.c samba-4.1.2/source4/winbind/wb_cmd_getpwnam.c
>--- samba-4.1.2.ORIG/source4/winbind/wb_cmd_getpwnam.c	2013-06-13 13:21:03.000000000 +0400
>+++ samba-4.1.2/source4/winbind/wb_cmd_getpwnam.c	2013-12-14 18:40:49.699600245 +0400
>@@ -133,9 +133,9 @@
> 	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 -ur samba-4.1.2.ORIG/source4/winbind/wb_cmd_getpwuid.c samba-4.1.2/source4/winbind/wb_cmd_getpwuid.c
>--- samba-4.1.2.ORIG/source4/winbind/wb_cmd_getpwuid.c	2013-06-13 13:21:03.000000000 +0400
>+++ samba-4.1.2/source4/winbind/wb_cmd_getpwuid.c	2013-12-14 18:41:23.907600887 +0400
>@@ -153,9 +153,9 @@
> 	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));

Actions: View

Attachments on bug 10324: 9526