[Spice-commits] Branch '0.8' - 2 commits - client/application.cpp server/reds.c

[Alon Levy]

 client/application.cpp |   10 ++++++++++
 server/reds.c          |    5 +++++
 2 files changed, 15 insertions(+)

New commits:
commit a7b66f77ba091479ced631fb31d7b9ad4fd94775
Author: Alon Levy <alevy at redhat.com>
Date:   Tue Jan 25 16:53:35 2011 +0200

    client/server: add missing USE_TUNNEL
    
    disable some code that only makes sense when USE_TUNNEL is defined
    in client and server channel security level setting.

diff --git a/client/application.cpp b/client/application.cpp
index bf6591e..13ff8fa 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -1928,7 +1928,9 @@ bool Application::set_channels_security(CmdLineParser& parser, bool on, char *va
     channels_names["cursor"] = SPICE_CHANNEL_CURSOR;
     channels_names["playback"] = SPICE_CHANNEL_PLAYBACK;
     channels_names["record"] = SPICE_CHANNEL_RECORD;
+#ifdef USE_TUNNEL
     channels_names["tunnel"] = SPICE_CHANNEL_TUNNEL;
+#endif
 #ifdef USE_SMARTCARD
     channels_names["smartcard"] = SPICE_CHANNEL_SMARTCARD;
 #endif
@@ -2090,7 +2092,9 @@ bool Application::set_enable_channels(CmdLineParser& parser, bool enable, char *
     channels_names["cursor"] = SPICE_CHANNEL_CURSOR;
     channels_names["playback"] = SPICE_CHANNEL_PLAYBACK;
     channels_names["record"] = SPICE_CHANNEL_RECORD;
+#ifdef USE_TUNNEL
     channels_names["tunnel"] = SPICE_CHANNEL_TUNNEL;
+#endif
 #ifdef USE_SMARTCARD
     channels_names["smartcard"] = SPICE_CHANNEL_SMARTCARD;
 #endif
diff --git a/server/reds.c b/server/reds.c
index f951390..f426325 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -4029,7 +4029,9 @@ __visible__ int spice_server_set_channel_security(SpiceServer *s, const char *ch
         [ SPICE_CHANNEL_CURSOR   ] = "cursor",
         [ SPICE_CHANNEL_PLAYBACK ] = "playback",
         [ SPICE_CHANNEL_RECORD   ] = "record",
+#ifdef USE_TUNNEL
         [ SPICE_CHANNEL_TUNNEL   ] = "tunnel",
+#endif
 #ifdef USE_SMARTCARD
         [ SPICE_CHANNEL_SMARTCARD] = "smartcard",
 #endif
commit 079acd99124ae7f85237df06e3995be6d03d0d55
Author: Alon Levy <alevy at redhat.com>
Date:   Tue Jan 25 16:05:45 2011 +0200

    client/server: add missing smartchannel channel security handling
    
    The name to channel id mapping for the smartcard channel is missing,
    add it in client and server.

diff --git a/client/application.cpp b/client/application.cpp
index 96a5c24..bf6591e 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -1929,6 +1929,9 @@ bool Application::set_channels_security(CmdLineParser& parser, bool on, char *va
     channels_names["playback"] = SPICE_CHANNEL_PLAYBACK;
     channels_names["record"] = SPICE_CHANNEL_RECORD;
     channels_names["tunnel"] = SPICE_CHANNEL_TUNNEL;
+#ifdef USE_SMARTCARD
+    channels_names["smartcard"] = SPICE_CHANNEL_SMARTCARD;
+#endif
 
     if (!strcmp(val, "all")) {
         if ((val = parser.next_argument())) {
@@ -2088,6 +2091,9 @@ bool Application::set_enable_channels(CmdLineParser& parser, bool enable, char *
     channels_names["playback"] = SPICE_CHANNEL_PLAYBACK;
     channels_names["record"] = SPICE_CHANNEL_RECORD;
     channels_names["tunnel"] = SPICE_CHANNEL_TUNNEL;
+#ifdef USE_SMARTCARD
+    channels_names["smartcard"] = SPICE_CHANNEL_SMARTCARD;
+#endif
 
     if (!strcmp(val, "all")) {
         if ((val = parser.next_argument())) {
diff --git a/server/reds.c b/server/reds.c
index 601acc4..f951390 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -4030,6 +4030,9 @@ __visible__ int spice_server_set_channel_security(SpiceServer *s, const char *ch
         [ SPICE_CHANNEL_PLAYBACK ] = "playback",
         [ SPICE_CHANNEL_RECORD   ] = "record",
         [ SPICE_CHANNEL_TUNNEL   ] = "tunnel",
+#ifdef USE_SMARTCARD
+        [ SPICE_CHANNEL_SMARTCARD] = "smartcard",
+#endif
     };
     int i;