#include "winbind/wb_server.h"
#include "smbd/service_stream.h"
#include "lib/stream/packet.h"
+#include "lib/tsocket/tsocket.h"
/*
work out if a packet is complete for protocols that use a 32 bit host byte
order length
*/
-NTSTATUS wbsrv_samba3_packet_full_request(void *private, DATA_BLOB blob, size_t *size)
+NTSTATUS wbsrv_samba3_packet_full_request(void *private_data, DATA_BLOB blob, size_t *size)
{
uint32_t *len;
if (blob.length < 4) {
}
-NTSTATUS wbsrv_samba3_pull_request(DATA_BLOB blob, struct wbsrv_connection *wbconn,
- struct wbsrv_samba3_call **_call)
+NTSTATUS wbsrv_samba3_pull_request(struct wbsrv_samba3_call *call)
{
- struct wbsrv_samba3_call *call;
-
- if (blob.length != sizeof(call->request)) {
+ if (call->in.length != sizeof(*call->request)) {
DEBUG(0,("wbsrv_samba3_pull_request: invalid blob length %lu should be %lu\n"
" make sure you use the correct winbind client tools!\n",
- (long)blob.length, (long)sizeof(call->request)));
+ (long)call->in.length, (long)sizeof(*call->request)));
return NT_STATUS_INVALID_PARAMETER;
}
- call = talloc_zero(wbconn, struct wbsrv_samba3_call);
- NT_STATUS_HAVE_NO_MEMORY(call);
+ call->request = talloc_zero(call, struct winbindd_request);
+ NT_STATUS_HAVE_NO_MEMORY(call->request);
/* the packet layout is the same as the in memory layout of the request, so just copy it */
- memcpy(&call->request, blob.data, sizeof(call->request));
+ memcpy(call->request, call->in.data, sizeof(*call->request));
- call->wbconn = wbconn;
- call->event_ctx = call->wbconn->conn->event.ctx;
-
- *_call = call;
return NT_STATUS_OK;
}
NTSTATUS wbsrv_samba3_handle_call(struct wbsrv_samba3_call *s3call)
{
- DEBUG(10, ("Got winbind samba3 request %d\n", s3call->request.cmd));
+ DEBUG(10, ("Got winbind samba3 request %d\n", s3call->request->cmd));
- s3call->response.length = sizeof(s3call->response);
+ s3call->response = talloc_zero(s3call, struct winbindd_response);
+ NT_STATUS_HAVE_NO_MEMORY(s3call->request);
- switch(s3call->request.cmd) {
+ s3call->response->length = sizeof(*s3call->response);
+
+ switch(s3call->request->cmd) {
case WINBINDD_INTERFACE_VERSION:
return wbsrv_samba3_interface_version(s3call);
case WINBINDD_DUAL_GID2SID:
return wbsrv_samba3_gid2sid(s3call);
- /* Unimplemented commands */
+ case WINBINDD_DOMAIN_INFO:
+ return wbsrv_samba3_domain_info(s3call);
- case WINBINDD_PAM_CHAUTHTOK:
case WINBINDD_PAM_LOGOFF:
+ return wbsrv_samba3_pam_logoff(s3call);
+
+ /* Unimplemented commands */
+ case WINBINDD_GETPWSID:
+ case WINBINDD_PAM_CHAUTHTOK:
case WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP:
case WINBINDD_LOOKUPRIDS:
case WINBINDD_SIDS_TO_XIDS:
case WINBINDD_ALLOCATE_GID:
case WINBINDD_SET_MAPPING:
case WINBINDD_REMOVE_MAPPING:
- case WINBINDD_SET_HWM:
- case WINBINDD_DOMAIN_INFO:
case WINBINDD_SHOW_SEQUENCE:
case WINBINDD_WINS_BYIP:
case WINBINDD_WINS_BYNAME:
case WINBINDD_GETGRLST:
+ case WINBINDD_GETSIDALIASES:
case WINBINDD_DSGETDCNAME:
case WINBINDD_INIT_CONNECTION:
case WINBINDD_DUAL_SIDS2XIDS:
case WINBINDD_DUAL_SET_MAPPING:
case WINBINDD_DUAL_REMOVE_MAPPING:
- case WINBINDD_DUAL_SET_HWM:
case WINBINDD_DUAL_USERINFO:
case WINBINDD_DUAL_GETSIDALIASES:
+ case WINBINDD_DUAL_NDRCMD:
case WINBINDD_CCACHE_NTLMAUTH:
case WINBINDD_NUM_CMDS:
DEBUG(10, ("Unimplemented winbind samba3 request %d\n",
- s3call->request.cmd));
+ s3call->request->cmd));
break;
}
- s3call->response.result = WINBINDD_ERROR;
+ s3call->response->result = WINBINDD_ERROR;
return NT_STATUS_OK;
}
-static NTSTATUS wbsrv_samba3_push_reply(struct wbsrv_samba3_call *call, TALLOC_CTX *mem_ctx, DATA_BLOB *_blob)
+static NTSTATUS wbsrv_samba3_push_reply(struct wbsrv_samba3_call *call)
{
- DATA_BLOB blob;
uint8_t *extra_data;
size_t extra_data_len = 0;
- extra_data = (uint8_t *)call->response.extra_data.data;
+ extra_data = (uint8_t *)call->response->extra_data.data;
if (extra_data != NULL) {
- extra_data_len = call->response.length -
- sizeof(call->response);
+ extra_data_len = call->response->length -
+ sizeof(*call->response);
}
- blob = data_blob_talloc(mem_ctx, NULL, call->response.length);
- NT_STATUS_HAVE_NO_MEMORY(blob.data);
+ call->out = data_blob_talloc(call, NULL, call->response->length);
+ NT_STATUS_HAVE_NO_MEMORY(call->out.data);
/* don't push real pointer values into sockets */
if (extra_data) {
- call->response.extra_data.data = (void *)0xFFFFFFFF;
+ call->response->extra_data.data = (void *)0xFFFFFFFF;
}
- memcpy(blob.data, &call->response, sizeof(call->response));
+
+ memcpy(call->out.data, call->response, sizeof(*call->response));
/* set back the pointer */
- call->response.extra_data.data = extra_data;
+ call->response->extra_data.data = extra_data;
if (extra_data) {
- memcpy(blob.data + sizeof(call->response), extra_data, extra_data_len);
+ memcpy(call->out.data + sizeof(*call->response),
+ extra_data,
+ extra_data_len);
}
- *_blob = blob;
return NT_STATUS_OK;
}
+static void wbsrv_samba3_send_reply_done(struct tevent_req *subreq);
+
/*
* queue a wbsrv_call reply on a wbsrv_connection
* NOTE: that this implies talloc_free(call),
*/
NTSTATUS wbsrv_samba3_send_reply(struct wbsrv_samba3_call *call)
{
- struct wbsrv_connection *wbconn = call->wbconn;
- DATA_BLOB rep;
+ struct wbsrv_connection *wbsrv_conn = call->wbconn;
+ struct tevent_req *subreq;
NTSTATUS status;
- status = wbsrv_samba3_push_reply(call, call, &rep);
+ status = wbsrv_samba3_push_reply(call);
NT_STATUS_NOT_OK_RETURN(status);
- status = packet_send(call->wbconn->packet, rep);
-
- talloc_free(call);
-
- if (!NT_STATUS_IS_OK(status)) {
- wbsrv_terminate_connection(wbconn,
- "failed to packet_send winbindd reply");
- return status;
+ call->out_iov[0].iov_base = (char *) call->out.data;
+ call->out_iov[0].iov_len = call->out.length;
+
+ subreq = tstream_writev_queue_send(call,
+ wbsrv_conn->conn->event.ctx,
+ wbsrv_conn->tstream,
+ wbsrv_conn->send_queue,
+ call->out_iov, 1);
+ if (subreq == NULL) {
+ wbsrv_terminate_connection(wbsrv_conn, "wbsrv_call_loop: "
+ "no memory for tstream_writev_queue_send");
+ return NT_STATUS_NO_MEMORY;
}
- /* the call isn't needed any more */
+ tevent_req_set_callback(subreq, wbsrv_samba3_send_reply_done, call);
+
return status;
}
-NTSTATUS wbsrv_samba3_process(void *private, DATA_BLOB blob)
+static void wbsrv_samba3_send_reply_done(struct tevent_req *subreq)
+{
+ struct wbsrv_samba3_call *call = tevent_req_callback_data(subreq,
+ struct wbsrv_samba3_call);
+ int sys_errno;
+ int rc;
+
+ rc = tstream_writev_queue_recv(subreq, &sys_errno);
+ TALLOC_FREE(subreq);
+ if (rc == -1) {
+ const char *reason;
+
+ reason = talloc_asprintf(call, "wbsrv_samba3_send_reply_done: "
+ "tstream_writev_queue_recv() - %d:%s",
+ sys_errno, strerror(sys_errno));
+ if (reason == NULL) {
+ reason = "wbsrv_samba3_send_reply_done: "
+ "tstream_writev_queue_recv() failed";
+ }
+
+ wbsrv_terminate_connection(call->wbconn, reason);
+ return;
+ }
+
+ talloc_free(call);
+}
+
+NTSTATUS wbsrv_samba3_process(struct wbsrv_samba3_call *call)
{
NTSTATUS status;
- struct wbsrv_connection *wbconn = talloc_get_type(private,
- struct wbsrv_connection);
- struct wbsrv_samba3_call *call;
- status = wbsrv_samba3_pull_request(blob, wbconn, &call);
+
+ status = wbsrv_samba3_pull_request(call);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
-
+
status = wbsrv_samba3_handle_call(call);
if (!NT_STATUS_IS_OK(status)) {
git.samba.org / amitay / samba.git / blobdiff