From cfbeb5efe9335d9a47bd5beebd81304cabab9f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 12 Apr 2024 01:58:30 +0200 Subject: [PATCH] tdeprint: Use 'httpGetAddress' for 'httpAddrLocalhost' on cups >= 2.0. This relates to issue #268. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- tdeprint/cups/cupsdconf2/cups-util.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tdeprint/cups/cupsdconf2/cups-util.c b/tdeprint/cups/cupsdconf2/cups-util.c index e3039ea94..907459c65 100644 --- a/tdeprint/cups/cupsdconf2/cups-util.c +++ b/tdeprint/cups/cupsdconf2/cups-util.c @@ -513,13 +513,23 @@ cups_local_auth(http_t *http) /* I - Connection */ * See if we are accessing localhost... the struct has changed in newer versions - PiggZ (adam@piggz.co.uk) */ -#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - if (!httpAddrLocalhost(http)) +#if (CUPS_VERSION_MAJOR >= 2) + if (!httpAddrLocalhost(httpGetAddress(http))) + { + return (0); + } +#elif CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) + if (!httpAddrLocalhost(http)) + { + return (0); + } #else if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 && - strcasecmp(http->hostname, "localhost") != 0) + strcasecmp(http->hostname, "localhost") != 0) + { + return (0); + } #endif - return (0); /* * Try opening a certificate file for this PID. If that fails,