diff options
| author | Jeremy Allison <jra@samba.org> | 2009-01-02 11:39:04 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-01-02 11:39:04 -0800 |
| commit | 11576353f645d7d7f44a74d27545b946c6175658 (patch) | |
| tree | a756a430d3fea82ac8a24144613d5d7e04d163f1 /source4/winbind | |
| parent | 2234173220c51c2e37818149ddf41421672904c0 (diff) | |
| parent | 268f3e93a4dd66ce43dc53278eff01f801ba5083 (diff) | |
| download | samba-11576353f645d7d7f44a74d27545b946c6175658.tar.gz samba-11576353f645d7d7f44a74d27545b946c6175658.tar.bz2 samba-11576353f645d7d7f44a74d27545b946c6175658.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/winbind')
| -rw-r--r-- | source4/winbind/wb_init_domain.c | 3 | ||||
| -rw-r--r-- | source4/winbind/wb_samba3_cmd.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 637cf10bb7..5953474c52 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -402,8 +402,7 @@ static void init_domain_recv_samr(struct composite_context *ctx) talloc_steal(state->domain->libnet_ctx->samr.pipe, state->domain->samr_binding); state->domain->libnet_ctx->samr.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; state->domain->libnet_ctx->samr.name = state->domain->info->name; - state->domain->libnet_ctx->samr.sid = dom_sid_dup(state->ctx, - state->domain->info->sid); + state->domain->libnet_ctx->samr.sid = state->domain->info->sid; composite_done(state->ctx); } diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index 6cad76b08b..ea3050503d 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -115,8 +115,8 @@ NTSTATUS wbsrv_samba3_priv_pipe_dir(struct wbsrv_samba3_call *s3call) { const char *path = s3call->wbconn->listen_socket->service->priv_socket_path; s3call->response.result = WINBINDD_OK; - WBSRV_SAMBA3_SET_STRING(s3call->response.extra_data.data, path); - + s3call->response.extra_data.data = path; + s3call->response.length += strlen(path) + 1; return NT_STATUS_OK; } |