diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-25 16:05:45 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-01-25 17:17:29 +0200 |
| commit | 079acd99124ae7f85237df06e3995be6d03d0d55 (patch) | |
| tree | b911028ccf7077a531d01e9394defef6b38777ee | |
| parent | 5c4fb478257a3adb7c875b4e77b6b4771540433c (diff) | |
| download | spice-079acd99124ae7f85237df06e3995be6d03d0d55.tar.gz spice-079acd99124ae7f85237df06e3995be6d03d0d55.tar.xz spice-079acd99124ae7f85237df06e3995be6d03d0d55.zip | |
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.
| -rw-r--r-- | client/application.cpp | 6 | ||||
| -rw-r--r-- | server/reds.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/client/application.cpp b/client/application.cpp index 96a5c24a..bf6591e4 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 601acc48..f9513900 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; |