summaryrefslogtreecommitdiff
path: root/frontends/gtk
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2019-07-27 18:53:31 -0400
committerDaniel Silverstone <dsilvers@digital-scurf.org>2019-08-01 12:03:06 +0100
commit87177d8aa109206d131e0d80a2080ce55dab01c7 (patch)
treea6dbfd7155df137b7c2e144354e5d0702ab62a6e /frontends/gtk
parentc798d18a607ac010784e473f98f24c01a3fc4fb5 (diff)
downloadnetsurf-87177d8aa109206d131e0d80a2080ce55dab01c7.tar.gz
netsurf-87177d8aa109206d131e0d80a2080ce55dab01c7.tar.bz2
GTK: prefer using curl's intrinsic defaults for CURLOPT_CA*
On distributions that ship only a ca-bundle in `/etc/ssl`, the configuration set at initialization will force curl to look for certificates that are not present in this directory. Removing the setting instead makes curl use its internal default. The framebuffer frontend will not set this option, and the only other frontend that sets it is BeOS. This issue can be observed (likely among other) on the NixOS Linux distribution.
Diffstat (limited to 'frontends/gtk')
-rw-r--r--frontends/gtk/gui.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 3163be16d..143a1041b 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -200,15 +200,11 @@ static nserror set_defaults(struct nsoption_s *defaults)
nsoption_setnull_charp(downloads_directory, strdup(fname));
}
- /* default path to certificates */
- nsoption_setnull_charp(ca_path, strdup("/etc/ssl/certs"));
-
if ((nsoption_charp(cookie_file) == NULL) ||
(nsoption_charp(cookie_jar) == NULL) ||
(nsoption_charp(url_file) == NULL) ||
(nsoption_charp(hotlist_path) == NULL) ||
- (nsoption_charp(downloads_directory) == NULL) ||
- (nsoption_charp(ca_path) == NULL)) {
+ (nsoption_charp(downloads_directory) == NULL)) {
NSLOG(netsurf, INFO,
"Failed initialising default resource paths");
return NSERROR_BAD_PARAMETER;