diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 21:25:17 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:47 +0100 |
| commit | b83a7a135f3247f553cb04173646b2d871b97235 (patch) | |
| tree | 4b2ea9eab1a603a6324e78bc98f91e9f3150a348 /source4/winbind/wb_cmd_getpwnam.c | |
| parent | 1f69adddc54d3b4b91df0ce639b3faccb85b2eb7 (diff) | |
| download | samba-b83a7a135f3247f553cb04173646b2d871b97235.tar.gz samba-b83a7a135f3247f553cb04173646b2d871b97235.tar.bz2 samba-b83a7a135f3247f553cb04173646b2d871b97235.zip | |
r26268: Avoid more use of global_loadparm - put lp_ctx in smb_server and wbsrv_connection.
(This used to be commit 7c008664238ed966cb82adf5b25b22157bb50730)
Diffstat (limited to 'source4/winbind/wb_cmd_getpwnam.c')
| -rw-r--r-- | source4/winbind/wb_cmd_getpwnam.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c index 5029e168a2..fb2dc197c9 100644 --- a/source4/winbind/wb_cmd_getpwnam.c +++ b/source4/winbind/wb_cmd_getpwnam.c @@ -86,7 +86,7 @@ static void cmd_getpwnam_recv_domain(struct composite_context *ctx) user_info = talloc(state, struct libnet_UserInfo); if (composite_nomem(user_info, state->ctx)) return; - ok= wb_samba3_split_username(state, global_loadparm, state->name, &user_dom, &user_name); + ok= wb_samba3_split_username(state, state->service->task->lp_ctx, state->name, &user_dom, &user_name); if(!ok){ composite_error(state->ctx, NT_STATUS_OBJECT_NAME_INVALID); return; @@ -124,12 +124,14 @@ static void cmd_getpwnam_recv_user_info(struct composite_context *ctx) WBSRV_SAMBA3_SET_STRING(pw->pw_name, user_info->out.account_name); WBSRV_SAMBA3_SET_STRING(pw->pw_passwd, "*"); WBSRV_SAMBA3_SET_STRING(pw->pw_gecos, user_info->out.full_name); - WBSRV_SAMBA3_SET_STRING(pw->pw_dir, lp_template_homedir(global_loadparm)); + WBSRV_SAMBA3_SET_STRING(pw->pw_dir, + lp_template_homedir(state->service->task->lp_ctx)); all_string_sub(pw->pw_dir, "%WORKGROUP%", state->workgroup_name, sizeof(fstring) - 1); all_string_sub(pw->pw_dir, "%ACCOUNTNAME%", user_info->out.account_name, sizeof(fstring) - 1); - WBSRV_SAMBA3_SET_STRING(pw->pw_shell, lp_template_shell(global_loadparm)); + WBSRV_SAMBA3_SET_STRING(pw->pw_shell, + lp_template_shell(state->service->task->lp_ctx)); state->group_sid = dom_sid_dup(state, user_info->out.primary_group_sid); if(composite_nomem(state->group_sid, state->ctx)) return; |