From 5a2ef3b21cd9ee1408a3c09d9a0ced363c8086f4 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy@redhat.com>
Date: Tue, 25 Jan 2011 16:05:45 +0200
Subject: [PATCH] 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.
---
 client/application.cpp | 6 ++++++
 server/reds.c          | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/client/application.cpp b/client/application.cpp
index d865e849..664449d3 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -1914,6 +1914,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())) {
@@ -2073,6 +2076,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 97e4623f..7f10f4d1 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3018,6 +3018,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;