diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 23:22:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 23:22:57 +0100 |
| commit | dcc4081f75f0d0c51878385477f7738f49a761dd (patch) | |
| tree | 45a738b1d23c7e5bd3e415e4d74594fd7dc7732a /source4/lib/tls/tls.c | |
| parent | 8df6af213a0ca9a70e30c630970b5e2d2debe821 (diff) | |
| download | samba-dcc4081f75f0d0c51878385477f7738f49a761dd.tar.gz samba-dcc4081f75f0d0c51878385477f7738f49a761dd.tar.bz2 samba-dcc4081f75f0d0c51878385477f7738f49a761dd.zip | |
Fix more compiler warnings.
Diffstat (limited to 'source4/lib/tls/tls.c')
| -rw-r--r-- | source4/lib/tls/tls.c | 20 |
1 files changed, 10 insertions, 10 deletions
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; |