52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From cb49e67303dbafbab1cebf4086e3ec15b7d56ee5 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Fri, 10 Mar 2023 09:22:43 +0100
|
|
Subject: [PATCH] url: only reuse connections with same GSS delegation
|
|
|
|
Reported-by: Harry Sintonen
|
|
Closes #10731
|
|
---
|
|
lib/url.c | 6 ++++++
|
|
lib/urldata.h | 1 +
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/lib/url.c b/lib/url.c
|
|
index df6ef1213..cc2f427dc 100644
|
|
--- a/lib/url.c
|
|
+++ b/lib/url.c
|
|
@@ -1305,6 +1305,11 @@ ConnectionExists(struct Curl_easy *data,
|
|
}
|
|
}
|
|
|
|
+ /* GSS delegation differences do not actually affect every connection
|
|
+ and auth method, but this check takes precaution before efficiency */
|
|
+ if(needle->gssapi_delegation != check->gssapi_delegation)
|
|
+ continue;
|
|
+
|
|
if(needle->handler->protocol & (CURLPROTO_SCP|CURLPROTO_SFTP)) {
|
|
if(!ssh_config_matches(needle, check))
|
|
continue;
|
|
@@ -1950,5 +1950,6 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
|
|
conn->fclosesocket = data->set.fclosesocket;
|
|
conn->closesocket_client = data->set.closesocket_client;
|
|
+ conn->gssapi_delegation = data->set.gssapi_delegation;
|
|
|
|
return conn;
|
|
error:
|
|
diff --git a/lib/urldata.h b/lib/urldata.h
|
|
index bf5daaf50..da5de5ba9 100644
|
|
--- a/lib/urldata.h
|
|
+++ b/lib/urldata.h
|
|
@@ -1061,6 +1061,8 @@ struct connectdata {
|
|
char *unix_domain_socket;
|
|
bool abstract_unix_socket;
|
|
#endif
|
|
+
|
|
+ unsigned char gssapi_delegation; /* inherited from set.gssapi_delegation */
|
|
};
|
|
|
|
/* The end of connectdata. */
|
|
--
|
|
2.40.1
|
|
|