From c831aa7554fa9dcb56e68db884022699e1f4a881 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 28 Jul 2017 13:19:52 +0900 Subject: [PATCH] journal-remote,gateway: use MHD_USE_TLS instead of MHD_USE_SSL The option is renamed in libmicrohttpd-0.9.52. --- src/journal-remote/journal-gatewayd.c | 4 ++-- src/journal-remote/journal-remote.c | 2 +- src/journal-remote/microhttpd-util.h | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 9a1c5b76ca..e75edce127 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -1053,10 +1053,10 @@ int main(int argc, char *argv[]) { {MHD_OPTION_HTTPS_MEM_KEY, 0, arg_key_pem}; opts[opts_pos++] = (struct MHD_OptionItem) {MHD_OPTION_HTTPS_MEM_CERT, 0, arg_cert_pem}; - flags |= MHD_USE_SSL; + flags |= MHD_USE_TLS; } if (arg_trust_pem) { - assert(flags & MHD_USE_SSL); + assert(flags & MHD_USE_TLS); opts[opts_pos++] = (struct MHD_OptionItem) {MHD_OPTION_HTTPS_MEM_TRUST, 0, arg_trust_pem}; } diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 810206c621..a658301252 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -671,7 +671,7 @@ static int setup_microhttpd_server(RemoteServer *s, opts[opts_pos++] = (struct MHD_OptionItem) {MHD_OPTION_HTTPS_MEM_CERT, 0, (char*) cert}; - flags |= MHD_USE_SSL; + flags |= MHD_USE_TLS; if (trust) opts[opts_pos++] = (struct MHD_OptionItem) diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h index 7f88c2cb7d..0e669aa1ad 100644 --- a/src/journal-remote/microhttpd-util.h +++ b/src/journal-remote/microhttpd-util.h @@ -41,6 +41,11 @@ # define MHD_USE_EPOLL MHD_USE_EPOLL_LINUX_ONLY #endif +/* Renamed in µhttpd 0.9.52 */ +#ifndef MHD_USE_SSL +# define MHD_USE_TLS MHD_USE_SSL +#endif + /* Both the old and new names are defines, check for the new one. */ /* Renamed in µhttpd 0.9.53 */ -- 2.25.1