summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawrence Teo <lteo@cvs.openbsd.org>2015-09-10 02:23:30 +0000
committerLawrence Teo <lteo@cvs.openbsd.org>2015-09-10 02:23:30 +0000
commit9d81f4064f222be33ecac21375c512a7332ff46d (patch)
tree70e0bad521b1e9d0a340a108456c61576e1a96ae
parenta3b100c7779c0d2d1741a318dc3afbc0ae8d3675 (diff)
Remove SOCKET_PROTOCOL, a redundant define that was only used once.
No binary change. ok millert@ miod@
-rw-r--r--usr.bin/openssl/s_socket.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/openssl/s_socket.c b/usr.bin/openssl/s_socket.c
index f9d9e5a8990..869211de735 100644
--- a/usr.bin/openssl/s_socket.c
+++ b/usr.bin/openssl/s_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_socket.c,v 1.7 2015/07/20 03:22:25 doug Exp $ */
+/* $OpenBSD: s_socket.c,v 1.8 2015/09/10 02:23:29 lteo Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -77,8 +77,6 @@ static int init_server(int *sock, int port, int type);
static int init_server_long(int *sock, int port, char *ip, int type);
static int do_accept(int acc_sock, int *sock, char **host);
-#define SOCKET_PROTOCOL IPPROTO_TCP
-
int
init_client(int *sock, char *host, char *port, int type, int af)
{
@@ -187,7 +185,7 @@ init_server_long(int *sock, int port, char *ip, int type)
memcpy(&server.sin_addr.s_addr, ip, 4);
if (type == SOCK_STREAM)
- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
+ s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
else /* type == SOCK_DGRAM */
s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);