Attachment 578610 Details for Bug 790416 – Move secure channel fixup to secure channel setter

[patch] Move secure channel fixup to secure channel setter

spice-xpi-15-move-secure-channel-fixup-to-setter.patch (text/plain), 2.11 KB, created by Uri Lublin on 2012-04-19 11:19:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Lublin

Created: 2012-04-19 11:19:37 UTC

Size: 2.11 KB

patch

obsolete

>From ebdc7f6f5a357c36cc86cb474fb72ae628fa38d6 Mon Sep 17 00:00:00 2001
>From: Christophe Fergeau <cfergeau@redhat.com>
>Date: Tue, 3 Apr 2012 15:58:45 +0200
>Subject: [PATCH] Move secure channel fixup to secure channel setter
>
>The secure channel names need to be fixed for compatibility with
>older spice versions. However, it's better to do it directly when
>m_secure_channels is set rather than waiting until its first use
>
>Backported to RHEL-6.3 by Uri Lublin <uril@redhat.com>
>
>---
>--- a/SpiceXPI/src/plugin/plugin.cpp	2012-04-19 13:57:00.370392672 +0300
>+++ b/SpiceXPI/src/plugin/plugin.cpp	2012-04-19 14:02:43.428387294 +0300
>@@ -358,6 +358,20 @@
> {
>     m_ssl_channels = aSSLChannels;
>     LOG_DEBUG(m_ssl_channels);
>+
>+    /*
>+     * HACK -- remove leading s from m_SSLChannels, e.g. "main" not "smain"
>+     * RHEL5 uses 'smain' and 'sinpusts
>+     * RHEL6 uses 'main'  and 'inputs'
>+     */
>+    std::size_t found = 0;
>+    while ((found = m_ssl_channels.find("smain", found)) != std::string::npos)
>+      m_ssl_channels.replace(found, 5, "main");
>+
>+    found = 0;
>+    while ((found = m_ssl_channels.find("sinputs", found)) != std::string::npos)
>+      m_ssl_channels.replace(found, 7, "inputs");
>+    /* HACK */
> }
> 
> //* attribute string TrustStore; */
>@@ -748,20 +762,6 @@
>         SendStr(CONTROLLER_SET_TITLE, m_title.c_str());
>         SendBool(CONTROLLER_SEND_CAD, m_send_ctrlaltdel);
> 
>-        /*
>-         * HACK -- remove leading s from m_SSLChannels, e.g. "main" not "smain"
>-         * RHEL5 uses 'smain' and 'sinpusts
>-         * RHEL6 uses 'main'  and 'inputs'
>-         */
>-        std::size_t found = 0;
>-        while ((found = m_ssl_channels.find("smain", found)) != std::string::npos)
>-            m_ssl_channels.replace(found, 5, "main");
>-
>-        found = 0;
>-        while ((found = m_ssl_channels.find("sinputs", found)) != std::string::npos)
>-            m_ssl_channels.replace(found, 7, "inputs");
>-        /* HACK */
>-
>         SendStr(CONTROLLER_SECURE_CHANNELS, m_ssl_channels.c_str());
>         SendStr(CONTROLLER_CA_FILE, m_trust_store_file.c_str());
>         SendStr(CONTROLLER_HOST_SUBJECT, m_host_subject.c_str());

Actions: View | Diff

Attachments on bug 790416: 578610 | 578611