summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2016-11-04 19:01:29 +0000
committerjsing <>2016-11-04 19:01:29 +0000
commit0029d157a8f39e659915f290c57b38e951124910 (patch)
tree75458e720eb57133f91e613d08bd095e372a6665 /src/lib
parent396ef4546761e49b2809c515d609d2120885c7d7 (diff)
downloadopenbsd-0029d157a8f39e659915f290c57b38e951124910.tar.gz
openbsd-0029d157a8f39e659915f290c57b38e951124910.tar.bz2
openbsd-0029d157a8f39e659915f290c57b38e951124910.zip
Avoid shadowing the socket global.
ok miod@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libtls/tls_server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index fbd726f335..e3b03e1301 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_server.c,v 1.28 2016/09/14 11:34:37 bcook Exp $ */ 1/* $OpenBSD: tls_server.c,v 1.29 2016/11/04 19:01:29 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -313,9 +313,9 @@ tls_accept_common(struct tls *ctx)
313} 313}
314 314
315int 315int
316tls_accept_socket(struct tls *ctx, struct tls **cctx, int socket) 316tls_accept_socket(struct tls *ctx, struct tls **cctx, int s)
317{ 317{
318 return (tls_accept_fds(ctx, cctx, socket, socket)); 318 return (tls_accept_fds(ctx, cctx, s, s));
319} 319}
320 320
321int 321int