From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 19 Jun 2023 15:12:37 +0000 (+0200)
Subject: journal-remote: make MHD_OPTION_EXTERNAL_LOGGER the first option
X-Git-Tag: v254-rc1~158^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=756ef1fa605af7bc579ad61755c5b021bff6633f;p=thirdparty%2Fsystemd.git

journal-remote: make MHD_OPTION_EXTERNAL_LOGGER the first option

To suppress a warning on journal-remote startup:
        systemd-journal-remote[691]: microhttpd:
        MHD_OPTION_EXTERNAL_LOGGER is not the first option specified for
        the daemon. Some messages may be printed by the standard MHD
        logger.
---

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 2d01e6013e2..2755f558121 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -369,8 +369,8 @@ static int setup_microhttpd_server(RemoteServer *s,
                                    const char *cert,
                                    const char *trust) {
         struct MHD_OptionItem opts[] = {
-                { MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) request_meta_free},
                 { MHD_OPTION_EXTERNAL_LOGGER, (intptr_t) microhttpd_logger},
+                { MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) request_meta_free},
                 { MHD_OPTION_LISTEN_SOCKET, fd},
                 { MHD_OPTION_CONNECTION_MEMORY_LIMIT, 128*1024},
                 { MHD_OPTION_END},