From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 1 Jul 2014 11:44:00 +0000 (+0100)
Subject: Make NO_SYS_UN_H compile.
X-Git-Tag: master-pre-reformat~589
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9cd86abb51c2cc76fcb33080620f319bd5fcb47d;p=thirdparty%2Fopenssl.git

Make NO_SYS_UN_H compile.
---

diff --git a/apps/s_client.c b/apps/s_client.c
index de6a984febf..2155b055cc3 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1511,9 +1511,12 @@ bad:
 #endif
 
 re_start:
-
+#ifdef NO_SYS_UN_H
+	if (init_client(&s,host,port,socket_type) == 0)
+#else
 	if ((!unix_path && (init_client(&s,host,port,socket_type) == 0)) ||
 			(unix_path && (init_client_unix(&s,unix_path) == 0)))
+#endif
 		{
 		BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
 		SHUTDOWN(s);
diff --git a/apps/s_server.c b/apps/s_server.c
index f890aac5b59..6dabdf4f406 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1012,7 +1012,9 @@ int MAIN(int argc, char *argv[])
 	int badarg = 0;
 	short port=PORT;
 	const char *unix_path=NULL;
+#ifndef NO_SYS_UN_H
 	int unlink_unix_path=0;
+#endif
 	int (*server_cb)(char *hostname, int s, int stype, unsigned char *context);
 	char *CApath=NULL,*CAfile=NULL;
 	char *chCApath=NULL,*chCAfile=NULL;
@@ -2141,6 +2143,7 @@ bad:
 		server_cb = www_body;
 	else
 		server_cb = sv_body;
+#ifndef NO_SYS_UN_H
 	if (unix_path)
 		{
 		if (unlink_unix_path)
@@ -2148,6 +2151,7 @@ bad:
 		do_server_unix(unix_path,&accept_socket,server_cb, context, naccept);
 		}
 	else
+#endif
 		do_server(port,socket_type,&accept_socket,server_cb, context, naccept);
 	print_stats(bio_s_out,ctx);
 	ret=0;