diff options
author | Richard Levitte <levitte@openssl.org> | 2019-11-25 13:27:33 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-11-29 09:45:48 +0100 |
commit | e9b95e42fbae668cb605287fa462a0d5f58b9caf (patch) | |
tree | 0a97818dfd5ba871d4a1a336e15183f9e06622b0 | |
parent | 3c86a2b5c81fd1d39155e4fea35a55c29f9bc4c4 (diff) | |
download | openssl-e9b95e42fbae668cb605287fa462a0d5f58b9caf.zip openssl-e9b95e42fbae668cb605287fa462a0d5f58b9caf.tar.gz openssl-e9b95e42fbae668cb605287fa462a0d5f58b9caf.tar.bz2 |
apps/ocsp.c: sock_timeout -> socket_timeout
It appears that 'sock_timeout' is defined at least with DJGPP, so we
rename our symbol and hope the new name isn't taken.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10515)
-rw-r--r-- | apps/ocsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index ee38b23..56d29b7 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -115,7 +115,7 @@ static int acfd = (int) INVALID_SOCKET; static int index_changed(CA_DB *); static void spawn_loop(void); static int print_syslog(const char *str, size_t len, void *levPtr); -static void sock_timeout(int signum); +static void socket_timeout(int signum); # endif # ifndef OPENSSL_NO_SOCK @@ -622,7 +622,7 @@ int ocsp_main(int argc, char **argv) if (multi && acbio != NULL) spawn_loop(); if (acbio != NULL && req_timeout > 0) - signal(SIGALRM, sock_timeout); + signal(SIGALRM, socket_timeout); #endif if (acbio != NULL) @@ -1389,7 +1389,7 @@ static int urldecode(char *p) # endif # ifdef OCSP_DAEMON -static void sock_timeout(int signum) +static void socket_timeout(int signum) { if (acfd != (int)INVALID_SOCKET) (void)shutdown(acfd, SHUT_RD); |