!128 fix build error
From: @eaglegai Reviewed-by: @seuzw Signed-off-by: @seuzw
This commit is contained in:
commit
ed773628fc
62
backport-fix-configure-disable-http-auth-build-error.patch
Normal file
62
backport-fix-configure-disable-http-auth-build-error.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
From d7b970e46ba29a7e558e21d19f485977ffed6266 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Stenberg <daniel@haxx.se>
|
||||||
|
Date: Fri, 29 Apr 2022 22:56:47 +0200
|
||||||
|
Subject: [PATCH] http: move Curl_allow_auth_to_host()
|
||||||
|
|
||||||
|
It was mistakenly put within the CURL_DISABLE_HTTP_AUTH #ifdef
|
||||||
|
|
||||||
|
Reported-by: Michael Olbrich
|
||||||
|
Fixes #8772
|
||||||
|
Closes #8775
|
||||||
|
---
|
||||||
|
lib/http.c | 30 +++++++++++++++---------------
|
||||||
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/http.c b/lib/http.c
|
||||||
|
index 0d5c449bc72a2..b215307dcaaa0 100644
|
||||||
|
--- a/lib/http.c
|
||||||
|
+++ b/lib/http.c
|
||||||
|
@@ -651,6 +651,21 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data)
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * Curl_allow_auth_to_host() tells if authentication, cookies or other
|
||||||
|
+ * "sensitive data" can (still) be sent to this host.
|
||||||
|
+ */
|
||||||
|
+bool Curl_allow_auth_to_host(struct Curl_easy *data)
|
||||||
|
+{
|
||||||
|
+ struct connectdata *conn = data->conn;
|
||||||
|
+ return (!data->state.this_is_a_follow ||
|
||||||
|
+ data->set.allow_auth_to_other_hosts ||
|
||||||
|
+ (data->state.first_host &&
|
||||||
|
+ strcasecompare(data->state.first_host, conn->host.name) &&
|
||||||
|
+ (data->state.first_remote_port == conn->remote_port) &&
|
||||||
|
+ (data->state.first_remote_protocol == conn->handler->protocol)));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#ifndef CURL_DISABLE_HTTP_AUTH
|
||||||
|
/*
|
||||||
|
* Output the correct authentication header depending on the auth type
|
||||||
|
@@ -775,21 +790,6 @@ output_auth_headers(struct Curl_easy *data,
|
||||||
|
return CURLE_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/*
|
||||||
|
- * Curl_allow_auth_to_host() tells if authentication, cookies or other
|
||||||
|
- * "sensitive data" can (still) be sent to this host.
|
||||||
|
- */
|
||||||
|
-bool Curl_allow_auth_to_host(struct Curl_easy *data)
|
||||||
|
-{
|
||||||
|
- struct connectdata *conn = data->conn;
|
||||||
|
- return (!data->state.this_is_a_follow ||
|
||||||
|
- data->set.allow_auth_to_other_hosts ||
|
||||||
|
- (data->state.first_host &&
|
||||||
|
- strcasecompare(data->state.first_host, conn->host.name) &&
|
||||||
|
- (data->state.first_remote_port == conn->remote_port) &&
|
||||||
|
- (data->state.first_remote_protocol == conn->handler->protocol)));
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
/**
|
||||||
|
* Curl_http_output_auth() setups the authentication headers for the
|
||||||
|
* host/proxy and the correct authentication
|
||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.79.1
|
Version: 7.79.1
|
||||||
Release: 7
|
Release: 8
|
||||||
Summary: Curl is used in command lines or scripts to transfer data
|
Summary: Curl is used in command lines or scripts to transfer data
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://curl.haxx.se/
|
URL: https://curl.haxx.se/
|
||||||
@ -26,6 +26,7 @@ Patch11: backport-CVE-2022-32205.patch
|
|||||||
Patch12: backport-CVE-2022-32206.patch
|
Patch12: backport-CVE-2022-32206.patch
|
||||||
Patch13: backport-CVE-2022-32207.patch
|
Patch13: backport-CVE-2022-32207.patch
|
||||||
Patch14: backport-CVE-2022-32208.patch
|
Patch14: backport-CVE-2022-32208.patch
|
||||||
|
Patch15: backport-fix-configure-disable-http-auth-build-error.patch
|
||||||
|
|
||||||
BuildRequires: automake brotli-devel coreutils gcc groff krb5-devel
|
BuildRequires: automake brotli-devel coreutils gcc groff krb5-devel
|
||||||
BuildRequires: libidn2-devel libnghttp2-devel libpsl-devel
|
BuildRequires: libidn2-devel libnghttp2-devel libpsl-devel
|
||||||
@ -200,6 +201,12 @@ rm -rf ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 25 2022 gaihuiying <eaglegai@163.com> - 7.79.1-8
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix build error when add --disable-http-auth configure option
|
||||||
|
|
||||||
* Tue Jul 05 2022 gaihuiying <eaglegai@163.com> - 7.79.1-7
|
* Tue Jul 05 2022 gaihuiying <eaglegai@163.com> - 7.79.1-7
|
||||||
- Type:cves
|
- Type:cves
|
||||||
- CVE:CVE-2022-32207
|
- CVE:CVE-2022-32207
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user