diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/events/tevent_s4.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/operational.c | 8 | ||||
| -rw-r--r-- | source4/lib/tls/tls.c | 20 |
3 files changed, 14 insertions, 18 deletions
diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c index 80267fdd22..e711e43761 100644 --- a/source4/lib/events/tevent_s4.c +++ b/source4/lib/events/tevent_s4.c @@ -17,8 +17,8 @@ */ #include "includes.h" -#include "tevent.h" -#include "tevent_internal.h" +#include <tevent.h> +#include <tevent_internal.h> /* this is used to catch debug messages from events diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c index 345441b5e1..4193f916a0 100644 --- a/source4/lib/ldb/modules/operational.c +++ b/source4/lib/ldb/modules/operational.c @@ -268,16 +268,12 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req } } - /* use new set of attrs if any */ - if (search_attrs == NULL) { - search_attrs = req->op.search.attrs; - } - ret = ldb_build_search_req_ex(&down_req, module->ldb, ac, req->op.search.base, req->op.search.scope, req->op.search.tree, - (const char * const *)search_attrs, + /* use new set of attrs if any */ + search_attrs?req->op.search.attrs:search_attrs, req->controls, ac, operational_callback, req); diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index 24e4632a49..d16df25548 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -454,7 +454,7 @@ init_failed: setup for a new connection */ struct socket_context *tls_init_server(struct tls_params *params, - struct socket_context *socket, + struct socket_context *socket_ctx, struct fd_event *fde, const char *plain_chars) { @@ -463,9 +463,9 @@ struct socket_context *tls_init_server(struct tls_params *params, struct socket_context *new_sock; NTSTATUS nt_status; - nt_status = socket_create_with_ops(socket, &tls_socket_ops, &new_sock, + nt_status = socket_create_with_ops(socket_ctx, &tls_socket_ops, &new_sock, SOCKET_TYPE_STREAM, - socket->flags | SOCKET_FLAG_ENCRYPT); + socket_ctx->flags | SOCKET_FLAG_ENCRYPT); if (!NT_STATUS_IS_OK(nt_status)) { return NULL; } @@ -475,13 +475,13 @@ struct socket_context *tls_init_server(struct tls_params *params, return NULL; } - tls->socket = socket; + tls->socket = socket_ctx; tls->fde = fde; if (talloc_reference(tls, fde) == NULL) { talloc_free(new_sock); return NULL; } - if (talloc_reference(tls, socket) == NULL) { + if (talloc_reference(tls, socket_ctx) == NULL) { talloc_free(new_sock); return NULL; } @@ -534,7 +534,7 @@ failed: /* setup for a new client connection */ -struct socket_context *tls_init_client(struct socket_context *socket, +struct socket_context *tls_init_client(struct socket_context *socket_ctx, struct fd_event *fde, const char *ca_path) { @@ -545,9 +545,9 @@ struct socket_context *tls_init_client(struct socket_context *socket, struct socket_context *new_sock; NTSTATUS nt_status; - nt_status = socket_create_with_ops(socket, &tls_socket_ops, &new_sock, + nt_status = socket_create_with_ops(socket_ctx, &tls_socket_ops, &new_sock, SOCKET_TYPE_STREAM, - socket->flags | SOCKET_FLAG_ENCRYPT); + socket_ctx->flags | SOCKET_FLAG_ENCRYPT); if (!NT_STATUS_IS_OK(nt_status)) { return NULL; } @@ -555,12 +555,12 @@ struct socket_context *tls_init_client(struct socket_context *socket, tls = talloc(new_sock, struct tls_context); if (tls == NULL) return NULL; - tls->socket = socket; + tls->socket = socket_ctx; tls->fde = fde; if (talloc_reference(tls, fde) == NULL) { return NULL; } - if (talloc_reference(tls, socket) == NULL) { + if (talloc_reference(tls, socket_ctx) == NULL) { return NULL; } new_sock->private_data = tls; |