shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

journal-remote,gateway: use MHD_USE_TLS instead of MHD_USE_SSL

Browse Source 
The option is renamed in libmicrohttpd-0.9.52.
This commit is contained in:
Yu Watanabe 2017-07-28 13:19:52 +09:00
parent b7f2d0ba24
commit c831aa7554
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/journal-remote/journal-gatewayd.c
View File

@ -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};
}

2
src/journal-remote/journal-remote.c
View File

@ -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)

5
src/journal-remote/microhttpd-util.h
View File

@ -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 */