diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-01-21 23:39:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-09 17:04:02 +0100 |
| commit | 2fd641547b5fb795fc17e98e47f489fa82e8ff42 (patch) | |
| tree | ebfd84898df8e1eabaaa2888c89e0c71137cb301 /src/lib/internet.cc | |
| parent | cf65c2709664936940935996499ac87dc47515f0 (diff) | |
Display the filename / URL that a screen certificate was obtained from (#1894).
Diffstat (limited to 'src/lib/internet.cc')
| -rw-r--r-- | src/lib/internet.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/internet.cc b/src/lib/internet.cc index 4fb6c7cb3..121d3524c 100644 --- a/src/lib/internet.cc +++ b/src/lib/internet.cc @@ -126,14 +126,14 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp) optional<string> -get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load) +get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path, string)> load) { ScopedTemporary temp; auto e = get_from_url (url, pasv, skip_pasv_ip, temp); if (e) { return e; } - return load (temp.file()); + return load (temp.file(), url); } @@ -142,7 +142,7 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string * @param load Function passed a (temporary) filesystem path of the unpacked file. */ optional<string> -get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load) +get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path, string)> load) { /* Download the ZIP file to temp_zip */ ScopedTemporary temp_zip; @@ -199,5 +199,5 @@ get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, functio zip_close (zip); temp_cert.close (); - return load (temp_cert.file()); + return load (temp_cert.file(), url); } |