[Pkg-ganeti-devel] [ganeti] 01/02: Fix gnt-instance info regression after CVE-2015-7945

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch debian/stable/wheezy
in repository ganeti.

commit 928474d2bf570199e1cb9247681cf57328c1a41d
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Jan 14 11:26:30 2016 +0200

    Fix gnt-instance info regression after CVE-2015-7945
    
    Closes: #810850
---
 debian/patches/CVE-2015-7945 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/debian/patches/CVE-2015-7945 b/debian/patches/CVE-2015-7945
index 6514e5d..cfb8a5f 100644
--- a/debian/patches/CVE-2015-7945
+++ b/debian/patches/CVE-2015-7945
@@ -32,3 +32,22 @@ index 2f31fe9..ee94f8f 100644
        "physical_id": dev.physical_id,
        "pstatus": dev_pstatus,
        "sstatus": dev_sstatus,
+
+commit b9bdb64348174f93206cda7e91d4e124065e9827
+Author: Apollon Oikonomopoulos <apoikos at gmail.com>
+Date:   Thu Jan 14 11:17:49 2016 +0200
+
+    Do not attempt to use the DRBD secret in info queries
+
+diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
+index 457a7c8..632036f 100644
+--- a/lib/client/gnt_instance.py
++++ b/lib/client/gnt_instance.py
+@@ -978,7 +978,6 @@ def _FormatLogicalID(dev_type, logical_id, roman):
+       ("nodeB", "%s, minor=%s" % (node_b, compat.TryToRoman(minor_b,
+                                                             convert=roman))),
+       ("port", compat.TryToRoman(port, convert=roman)),
+-      ("auth key", key),
+       ]
+   elif dev_type == constants.LD_LV:
+     vg_name, lv_name = logical_id

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git