pidgin: 97e5ac91: Don't fail an assertion and don't return...

markdoliner at pidgin.im markdoliner at pidgin.im
Tue Jul 14 14:01:37 EDT 2009


-----------------------------------------------------------------
Revision: 97e5ac91f0ed5cbe744a8a399ea990d71f458a61
Ancestor: 25fba04ec8d380ed765938363611931cc89b6097
Author: markdoliner at pidgin.im
Date: 2009-07-14T17:56:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/97e5ac91f0ed5cbe744a8a399ea990d71f458a61

Modified files:
        libpurple/certificate.c

ChangeLog: 

Don't fail an assertion and don't return FALSE if we can't create
the certificate cache directory.  This happens when passing -c /dev/null
to pidgin when starting.  I think this is a reasonable change, but
I'm not very familiar with our certificate code

-------------- next part --------------
============================================================
--- libpurple/certificate.c	c4df4d71255d7376fab521b9b36c855e4c9b11f0
+++ libpurple/certificate.c	20a0156eec81b99e724243387aac2355ba126464
@@ -923,9 +923,13 @@ x509_tls_peers_init(void)
 	poolpath = purple_certificate_pool_mkpath(&x509_tls_peers, NULL);
 	ret = purple_build_dir(poolpath, 0700); /* Make it this user only */
 
+	if (ret != 0)
+		purple_debug_info("certificate/tls_peers",
+				"Could not create %s.  Certificates will not be cached.\n",
+				poolpath);
+
 	g_free(poolpath);
 
-	g_return_val_if_fail(ret == 0, FALSE);
 	return TRUE;
 }
 


More information about the Commits mailing list