mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
r17237: - keep pointer to the different sockets
- we need this to later:
- to disallow a StartTLS when TLS is already in use
- to place the TLS socket between the raw and sasl socket
when we had a sasl bind before the StartTLS
- and rfc4513 says that the server may allow to remove the TLS from
the tcp connection again and reuse raw tcp
- and also a 2nd sasl bind should replace the old sasl socket
metze
(This used to be commit 10cb9c07ac
)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
ec8d486e26
commit
4cdcc17893
@ -747,6 +747,7 @@ static void ldapsrv_start_tls(void *private)
|
||||
talloc_steal(ctx->conn->connection, ctx->tls_socket);
|
||||
talloc_unlink(ctx->conn->connection, ctx->conn->connection->socket);
|
||||
|
||||
ctx->conn->sockets.tls = ctx->tls_socket;
|
||||
ctx->conn->connection->socket = ctx->tls_socket;
|
||||
packet_set_socket(ctx->conn->packet, ctx->conn->connection->socket);
|
||||
}
|
||||
@ -767,7 +768,6 @@ static NTSTATUS ldapsrv_ExtendedRequest(struct ldapsrv_call *call)
|
||||
|
||||
/* check if we have a START_TLS call */
|
||||
if (strcmp(req->oid, LDB_EXTENDED_START_TLS_OID) == 0) {
|
||||
NTSTATUS status;
|
||||
struct ldapsrv_starttls_context *ctx;
|
||||
int result = 0;
|
||||
const char *errstr;
|
||||
|
Reference in New Issue
Block a user