Mercurial > ~mikael > mcabber > hg

diff mcabber/src/main.c @ 1167:9726c78a91f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow '~' (HOME directory) in config options
author Mikael Berthe <mikael@lilotux.net>
date Sun, 18 Feb 2007 11:03:49 +0100
parents 910e2cce49b3
children 960f34ec22a2
line wrap: on
line diff
--- a/mcabber/src/main.c	Sat Feb 17 15:14:39 2007 +0100
+++ b/mcabber/src/main.c	Sun Feb 18 11:03:49 2007 +0100
@@ -71,6 +71,7 @@
   int ssl;
   int sslverify = -1;
   const char *sslvopt = NULL, *cafile = NULL, *capath = NULL, *ciphers = NULL;
+  char *cafile_xp = NULL, *capath_xp = NULL;
   unsigned int port;
 
   servername = settings_opt_get("server");
@@ -112,7 +113,11 @@
     cafile = capath = ciphers = NULL;
   }
 #endif
-  cw_set_ssl_options(sslverify, cafile, capath, ciphers, servername);
+  if (cafile)   cafile_xp = expand_filename(cafile);
+  if (capath)   capath_xp = expand_filename(capath);
+  cw_set_ssl_options(sslverify, cafile_xp, capath_xp, ciphers, servername);
+  g_free(cafile_xp);
+  g_free(capath_xp);
 
   /* Connect to server */
   scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Connecting to server: %s",