generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make NO_SYS_UN_H compile.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2014-07-01 12:44:00 +01:00
parent 387b844ffd
commit 9cd86abb51
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/s_client.c
View File

@ -1511,9 +1511,12 @@ bad:
#endif #endif
re_start: 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)) || if ((!unix_path && (init_client(&s,host,port,socket_type) == 0)) ||
(unix_path && (init_client_unix(&s,unix_path) == 0))) (unix_path && (init_client_unix(&s,unix_path) == 0)))
#endif
{ {
BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error()); BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
SHUTDOWN(s); SHUTDOWN(s);

4
apps/s_server.c
View File

@ -1012,7 +1012,9 @@ int MAIN(int argc, char *argv[])
int badarg = 0; int badarg = 0;
short port=PORT; short port=PORT;
const char *unix_path=NULL; const char *unix_path=NULL;
#ifndef NO_SYS_UN_H
int unlink_unix_path=0; int unlink_unix_path=0;
#endif
int (*server_cb)(char *hostname, int s, int stype, unsigned char *context); int (*server_cb)(char *hostname, int s, int stype, unsigned char *context);
char *CApath=NULL,*CAfile=NULL; char *CApath=NULL,*CAfile=NULL;
char *chCApath=NULL,*chCAfile=NULL; char *chCApath=NULL,*chCAfile=NULL;
@ -2141,6 +2143,7 @@ bad:
server_cb = www_body; server_cb = www_body;
else else
server_cb = sv_body; server_cb = sv_body;
#ifndef NO_SYS_UN_H
if (unix_path) if (unix_path)
{ {
if (unlink_unix_path) if (unlink_unix_path)
@ -2148,6 +2151,7 @@ bad:
do_server_unix(unix_path,&accept_socket,server_cb, context, naccept); do_server_unix(unix_path,&accept_socket,server_cb, context, naccept);
} }
else else
#endif
do_server(port,socket_type,&accept_socket,server_cb, context, naccept); do_server(port,socket_type,&accept_socket,server_cb, context, naccept);
print_stats(bio_s_out,ctx); print_stats(bio_s_out,ctx);
ret=0; ret=0;