From 0029d157a8f39e659915f290c57b38e951124910 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 4 Nov 2016 19:01:29 +0000
Subject: Avoid shadowing the socket global.

ok miod@
---
 src/lib/libtls/tls_server.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib')

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 @@
-/* $OpenBSD: tls_server.c,v 1.28 2016/09/14 11:34:37 bcook Exp $ */
+/* $OpenBSD: tls_server.c,v 1.29 2016/11/04 19:01:29 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -313,9 +313,9 @@ tls_accept_common(struct tls *ctx)
 }
 
 int
-tls_accept_socket(struct tls *ctx, struct tls **cctx, int socket)
+tls_accept_socket(struct tls *ctx, struct tls **cctx, int s)
 {
-	return (tls_accept_fds(ctx, cctx, socket, socket));
+	return (tls_accept_fds(ctx, cctx, s, s));
 }
 
 int
-- 
cgit v1.2.3-55-g6feb