[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.3.10-5-2-g138daff

[Guido Günther]

The following commit has been merged in the master branch:
commit 405bfa700426f62dadbe684286e2c81bc06a3709
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Apr 4 14:46:01 2010 +0200

    New patch 0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
    
    Fix missing intialisation of sysdir and uderdir
    
    Closes: #576102

diff --git a/debian/patches/0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch b/debian/patches/0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
new file mode 100644
index 0000000..f041a93
--- /dev/null
+++ b/debian/patches/0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
@@ -0,0 +1,46 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 4 Apr 2010 14:27:28 +0200
+Subject: [PATCH] Fix missing intialisation of sysdir and uderdir
+
+introduced by PATH_MAX removal.
+
+Closes: #576102
+---
+ src/vncdisplay.c |   15 +++++----------
+ 1 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/src/vncdisplay.c b/src/vncdisplay.c
+index 98c2795..89811f6 100644
+--- a/src/vncdisplay.c
++++ b/src/vncdisplay.c
+@@ -2019,24 +2019,19 @@ static int vnc_display_set_x509_credential(VncDisplay *obj, const char *name)
+ {
+ 	gboolean ret = FALSE;
+ 	char *file;
+-	char *sysdir;
++	char *sysdir = g_strdup_printf("%s/pki", SYSCONFDIR);
+ #ifndef WIN32
+-	char *userdir;
+ 	struct passwd *pw;
+-	char *dirs[] = { sysdir, userdir };
+-#else
+-	char *dirs[] = { sysdir };
+-#endif
+ 
+-#ifndef WIN32
+ 	if (!(pw = getpwuid(getuid())))
+ 		return TRUE;
+ 
+-	userdir = g_strdup_printf("%s/.pki", pw->pw_dir);
++	char *userdir = userdir = g_strdup_printf("%s/.pki", pw->pw_dir);
++	char *dirs[] = { sysdir, userdir };
++#else
++	char *dirs[] = { sysdir };
+ #endif
+ 
+-	sysdir = g_strdup_printf("%s/pki", SYSCONFDIR);
+-
+ 	if ((file = vnc_display_best_path("CA", "cacert.pem", dirs,
+ 				  sizeof(dirs)/sizeof(dirs[0]))) == NULL) {
+ 		ret = TRUE;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 016f932..2b43721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Add-Wl-since-no-undefined-is-a-linker-option.patch
 0007-Explicitly-link-against-X11-libs-for-XkbGetKeyboard.patch
 0008-Add-missing-symbols.patch
+0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch

-- 
libgtk-vnc Debian packaging