diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-07-21 01:34:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:15 -0500 |
| commit | a1a842eb44b5bbb59af445af7a2c4a00e8c0188a (patch) | |
| tree | 038faa4a98f386f2fd571799842deedefdbf6746 /source4/lib/tls | |
| parent | dc2715b49c477adb4ba95149a3bfdf79457fa6c0 (diff) | |
| download | samba-a1a842eb44b5bbb59af445af7a2c4a00e8c0188a.tar.gz samba-a1a842eb44b5bbb59af445af7a2c4a00e8c0188a.tar.bz2 samba-a1a842eb44b5bbb59af445af7a2c4a00e8c0188a.zip | |
r17168: Now that TLS (and soon SASL) is below the socket layer, we need to
make the testnonblock skip some things. The socket *under* the tls
socket is still tested.
Andrew Bartlett
(This used to be commit 9c33c6a20a77e3f15eac3d62488117517afad940)
Diffstat (limited to 'source4/lib/tls')
| -rw-r--r-- | source4/lib/tls/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/tls/tls.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 2ab296049b..f75c613e73 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = \ tls.o \ tlscert.o PUBLIC_DEPENDENCIES = \ - LIBTALLOC GNUTLS LIBSAMBA-CONFIG + LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket # # End SUBSYSTEM LIBTLS ################################################ diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index 936c18c0c6..1ba8ae9779 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -443,7 +443,8 @@ struct socket_context *tls_init_server(struct tls_params *params, NTSTATUS nt_status; nt_status = socket_create_with_ops(socket, &tls_socket_ops, &new_sock, - SOCKET_TYPE_STREAM, 0); + SOCKET_TYPE_STREAM, + socket->flags | SOCKET_FLAG_FAKE); if (!NT_STATUS_IS_OK(nt_status)) { return NULL; } @@ -522,7 +523,8 @@ struct socket_context *tls_init_client(struct socket_context *socket, NTSTATUS nt_status; nt_status = socket_create_with_ops(socket, &tls_socket_ops, &new_sock, - SOCKET_TYPE_STREAM, 0); + SOCKET_TYPE_STREAM, + socket->flags | SOCKET_FLAG_FAKE); if (!NT_STATUS_IS_OK(nt_status)) { return NULL; } |