summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/winbind/wb_async_helpers.c136
-rw-r--r--source4/winbind/wb_samba3_cmd.c4
-rw-r--r--source4/winbind/wb_server.h6
3 files changed, 130 insertions, 16 deletions
diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index d77e4d12ad..5009cf4824 100644
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -1012,7 +1012,6 @@ NTSTATUS wb_cmd_lookupname(struct wbsrv_call *call, const char *name,
struct cmd_checkmachacc_state {
struct composite_context *ctx;
struct wbsrv_call *call;
- struct cli_credentials *wks_creds;
};
static void cmd_checkmachacc_recv_lsa(struct composite_context *ctx);
@@ -1035,18 +1034,22 @@ struct composite_context *wb_cmd_checkmachacc_send(struct wbsrv_call *call)
result->private_data = state;
state->call = call;
- state->wks_creds = cli_credentials_init(state);
- if (state->wks_creds == NULL) goto failed;
+ if (service->schannel_creds != NULL) {
+ talloc_free(service->schannel_creds);
+ }
+
+ service->schannel_creds = cli_credentials_init(service);
+ if (service->schannel_creds == NULL) goto failed;
- cli_credentials_set_conf(state->wks_creds);
+ cli_credentials_set_conf(service->schannel_creds);
state->ctx->status =
- cli_credentials_set_machine_account(state->wks_creds);
+ cli_credentials_set_machine_account(service->schannel_creds);
if (!NT_STATUS_IS_OK(state->ctx->status)) goto failed;
- if (service->netlogon_pipe != NULL) {
- talloc_free(service->netlogon_pipe);
- service->netlogon_pipe = NULL;
+ if (service->netlogon_auth2_pipe != NULL) {
+ talloc_free(service->netlogon_auth2_pipe);
+ service->netlogon_auth2_pipe = NULL;
}
if (service->lsa_pipe != NULL) {
@@ -1055,7 +1058,7 @@ struct composite_context *wb_cmd_checkmachacc_send(struct wbsrv_call *call)
if (tree == NULL) goto failed;
- ctx = wb_get_schannel_creds_send(state->wks_creds, tree,
+ ctx = wb_get_schannel_creds_send(service->schannel_creds, tree,
result->event_ctx);
if (ctx == NULL) goto failed;
@@ -1104,7 +1107,7 @@ static void cmd_checkmachacc_recv_lsa(struct composite_context *ctx)
return;
}
- ctx = wb_get_schannel_creds_send(state->wks_creds, tree,
+ ctx = wb_get_schannel_creds_send(service->schannel_creds, tree,
state->ctx->event_ctx);
comp_cont(state->ctx, ctx, cmd_checkmachacc_recv_creds, state);
}
@@ -1121,13 +1124,13 @@ static void cmd_checkmachacc_recv_creds(struct composite_context *ctx)
state->ctx->status = wb_get_schannel_creds_recv(ctx, state, &pipe);
if (!comp_is_ok(state->ctx)) return;
- if (service->netlogon_pipe != NULL) {
+ if (service->netlogon_auth2_pipe != NULL) {
/* Someone else was faster, we need to replace it with our
* pipe */
- talloc_free(service->netlogon_pipe);
+ talloc_free(service->netlogon_auth2_pipe);
}
- service->netlogon_pipe = talloc_steal(service, pipe);
+ service->netlogon_auth2_pipe = talloc_steal(service, pipe);
comp_done(state->ctx);
}
@@ -1142,3 +1145,110 @@ NTSTATUS wb_cmd_checkmachacc(struct wbsrv_call *call)
struct composite_context *c = wb_cmd_checkmachacc_send(call);
return wb_cmd_checkmachacc_recv(c);
}
+
+struct get_netlogon_pipe_state {
+ struct composite_context *ctx;
+ struct wbsrv_call *call;
+ struct dcerpc_pipe *p;
+};
+
+static void get_netlogon_pipe_recv_machacc(struct composite_context *ctx);
+static void get_netlogon_pipe_recv_pipe(struct composite_context *ctx);
+
+struct composite_context *wb_get_netlogon_pipe_send(struct wbsrv_call *call)
+{
+ struct composite_context *result, *ctx;
+ struct get_netlogon_pipe_state *state;
+ struct wbsrv_service *service = call->wbconn->listen_socket->service;
+
+ result = talloc(call, struct composite_context);
+ if (result == NULL) goto failed;
+ result->state = COMPOSITE_STATE_IN_PROGRESS;
+ result->event_ctx = call->event_ctx;
+
+ state = talloc(result, struct get_netlogon_pipe_state);
+ if (state == NULL) goto failed;
+ state->ctx = result;
+ result->private_data = state;
+ state->call = call;
+
+ if (service->netlogon_pipe != NULL) {
+ talloc_free(service->netlogon_pipe);
+ service->netlogon_pipe = NULL;
+ }
+
+ ctx = wb_cmd_checkmachacc_send(call);
+ if (ctx == NULL) goto failed;
+ ctx->async.fn = get_netlogon_pipe_recv_machacc;
+ ctx->async.private_data = state;
+ return result;
+
+ failed:
+ talloc_free(result);
+ return NULL;
+}
+
+static void get_netlogon_pipe_recv_machacc(struct composite_context *ctx)
+{
+ struct get_netlogon_pipe_state *state =
+ talloc_get_type(ctx->async.private_data,
+ struct get_netlogon_pipe_state);
+ struct wbsrv_service *service =
+ state->call->wbconn->listen_socket->service;
+
+ struct smbcli_tree *tree = NULL;
+
+ state->ctx->status = wb_cmd_checkmachacc_recv(ctx);
+ if (!comp_is_ok(state->ctx)) return;
+
+ state->p = dcerpc_pipe_init(state, state->ctx->event_ctx);
+ if (comp_nomem(state->p, state->ctx)) return;
+
+ if (service->lsa_pipe != NULL) {
+ tree = dcerpc_smb_tree(service->lsa_pipe->conn);
+ }
+
+ if (tree == NULL) {
+ comp_error(state->ctx, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
+
+ ctx = dcerpc_pipe_open_smb_send(state->p->conn, tree, "\\netlogon");
+ comp_cont(state->ctx, ctx, get_netlogon_pipe_recv_pipe, state);
+}
+
+static void get_netlogon_pipe_recv_pipe(struct composite_context *ctx)
+{
+ struct get_netlogon_pipe_state *state =
+ talloc_get_type(ctx->async.private_data,
+ struct get_netlogon_pipe_state);
+ struct wbsrv_service *service =
+ state->call->wbconn->listen_socket->service;
+
+ state->ctx->status = dcerpc_pipe_open_smb_recv(ctx);
+ if (!comp_is_ok(state->ctx)) return;
+
+ state->p->conn->flags |= (DCERPC_SIGN | DCERPC_SEAL);
+ state->ctx->status =
+ dcerpc_bind_auth_password(state->p,
+ DCERPC_NETLOGON_UUID,
+ DCERPC_NETLOGON_VERSION,
+ service->schannel_creds,
+ DCERPC_AUTH_TYPE_SCHANNEL,
+ NULL);
+ if (!comp_is_ok(state->ctx)) return;
+
+ service->netlogon_pipe = talloc_steal(service, state->p);
+ comp_done(state->ctx);
+}
+
+NTSTATUS wb_get_netlogon_pipe_recv(struct composite_context *c)
+{
+ return composite_wait(c);
+}
+
+NTSTATUS wb_get_netlogon_pipe(struct wbsrv_call *call)
+{
+ struct composite_context *c = wb_get_netlogon_pipe_send(call);
+ return wb_get_netlogon_pipe_recv(c);
+}
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 23e04ba0e0..6687c861af 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -86,7 +86,7 @@ NTSTATUS wbsrv_samba3_check_machacc(struct wbsrv_samba3_call *s3call)
DEBUG(5, ("wbsrv_samba3_check_machacc called\n"));
- ctx = wb_cmd_checkmachacc_send(s3call->call);
+ ctx = wb_get_netlogon_pipe_send(s3call->call);
NT_STATUS_HAVE_NO_MEMORY(ctx);
ctx->async.fn = checkmachacc_recv_creds;
@@ -102,7 +102,7 @@ static void checkmachacc_recv_creds(struct composite_context *ctx)
struct wbsrv_samba3_call);
NTSTATUS status;
- status = wb_cmd_checkmachacc_recv(ctx);
+ status = wb_get_netlogon_pipe_recv(ctx);
if (NT_STATUS_IS_OK(status)) {
s3call->response.result = WINBINDD_OK;
} else {
diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 9d7f0c8336..d3596975ed 100644
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -32,8 +32,12 @@
/* this struct stores global data for the winbind task */
struct wbsrv_service {
struct task_server *task;
- struct dcerpc_pipe *netlogon_pipe;
+
+ struct dcerpc_pipe *netlogon_auth2_pipe;
+ struct cli_credentials *schannel_creds;
+
struct dcerpc_pipe *lsa_pipe;
+ struct dcerpc_pipe *netlogon_pipe;
};
/*