diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-09 14:32:07 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-09 14:32:07 +0000 |
| commit | 0030d75585823505504d659ad3c3b8ea693c7c39 (patch) | |
| tree | 5893e4114b30400c69cf6729958e34ef4fa7f1ee /lib/libtls/tls_server.c | |
| parent | 522f4e7aee3e588cc847d4f0914f1a9b48396894 (diff) | |
Only take ownership of a socket if we allocated it within libtls. If we are
passed a socket then the caller is responsible for closing it.
ok bcook@
Diffstat (limited to 'lib/libtls/tls_server.c')
| -rw-r--r-- | lib/libtls/tls_server.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/libtls/tls_server.c b/lib/libtls/tls_server.c index bb29c7ce425..190682e630a 100644 --- a/lib/libtls/tls_server.c +++ b/lib/libtls/tls_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_server.c,v 1.10 2015/08/27 15:26:50 jsing Exp $ */ +/* $OpenBSD: tls_server.c,v 1.11 2015/09/09 14:32:06 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -148,11 +148,5 @@ err: int tls_accept_socket(struct tls *ctx, struct tls **cctx, int socket) { - int rv; - - rv = tls_accept_fds(ctx, cctx, socket, socket); - if (*cctx != NULL) - (*cctx)->socket = socket; - - return (rv); + return (tls_accept_fds(ctx, cctx, socket, socket)); } |