diff options
Diffstat (limited to 'source4/winbind/wb_samba3_cmd.c')
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index af361794ed..4c8a9f9355 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -21,8 +21,6 @@ */ #include "includes.h" -#include "nsswitch/winbind_nss_config.h" -#include "nsswitch/winbindd_nss.h" #include "winbind/wb_server.h" #include "winbind/wb_async_helpers.h" #include "winbind/wb_helper.h" @@ -31,6 +29,7 @@ #include "librpc/gen_ndr/netlogon.h" #include "libcli/security/security.h" #include "auth/pam_errors.h" +#include "param/param.h" /* Send off the reply to an async Samba3 query, handling filling in the PAM, NTSTATUS and string errors. @@ -87,7 +86,7 @@ NTSTATUS wbsrv_samba3_interface_version(struct wbsrv_samba3_call *s3call) NTSTATUS wbsrv_samba3_info(struct wbsrv_samba3_call *s3call) { s3call->response.result = WINBINDD_OK; - s3call->response.data.info.winbind_separator = *lp_winbind_separator(); + s3call->response.data.info.winbind_separator = *lp_winbind_separator(global_loadparm); WBSRV_SAMBA3_SET_STRING(s3call->response.data.info.samba_version, SAMBA_VERSION_STRING); return NT_STATUS_OK; @@ -97,7 +96,7 @@ NTSTATUS wbsrv_samba3_domain_name(struct wbsrv_samba3_call *s3call) { s3call->response.result = WINBINDD_OK; WBSRV_SAMBA3_SET_STRING(s3call->response.data.domain_name, - lp_workgroup()); + lp_workgroup(global_loadparm)); return NT_STATUS_OK; } @@ -105,7 +104,7 @@ NTSTATUS wbsrv_samba3_netbios_name(struct wbsrv_samba3_call *s3call) { s3call->response.result = WINBINDD_OK; WBSRV_SAMBA3_SET_STRING(s3call->response.data.netbios_name, - lp_netbios_name()); + lp_netbios_name(global_loadparm)); return NT_STATUS_OK; } @@ -113,7 +112,7 @@ NTSTATUS wbsrv_samba3_priv_pipe_dir(struct wbsrv_samba3_call *s3call) { s3call->response.result = WINBINDD_OK; s3call->response.extra_data.data = - smbd_tmp_path(s3call, WINBINDD_SAMBA3_PRIVILEGED_SOCKET); + smbd_tmp_path(s3call, global_loadparm, WINBINDD_SAMBA3_PRIVILEGED_SOCKET); NT_STATUS_HAVE_NO_MEMORY(s3call->response.extra_data.data); return NT_STATUS_OK; } @@ -253,7 +252,7 @@ static void userdomgroups_recv_groups(struct composite_context *ctx) } for (i=0; i<num_sids; i++) { - sids_string = talloc_asprintf_append( + sids_string = talloc_asprintf_append_buffer( sids_string, "%s\n", dom_sid_string(s3call, sids[i])); } @@ -320,7 +319,7 @@ static void usersids_recv_sids(struct composite_context *ctx) } for (i=0; i<num_sids; i++) { - sids_string = talloc_asprintf_append( + sids_string = talloc_asprintf_append_buffer( sids_string, "%s\n", dom_sid_string(s3call, sids[i])); if (sids_string == NULL) { status = NT_STATUS_NO_MEMORY; @@ -621,7 +620,7 @@ static void list_trustdom_recv_doms(struct composite_context *ctx) } for (i=0; i<num_domains; i++) { - result = talloc_asprintf_append( + result = talloc_asprintf_append_buffer( result, "%s\\%s\\%s", domains[i]->name, domains[i]->name, dom_sid_string(s3call, domains[i]->sid)); |