diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-25 16:53:35 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-01-25 17:17:35 +0200 |
| commit | a7b66f77ba091479ced631fb31d7b9ad4fd94775 (patch) | |
| tree | 84a4efba875d7b684f3fcebc0f2ad97127aec556 | |
| parent | 079acd99124ae7f85237df06e3995be6d03d0d55 (diff) | |
| download | spice-a7b66f77ba091479ced631fb31d7b9ad4fd94775.tar.gz spice-a7b66f77ba091479ced631fb31d7b9ad4fd94775.tar.xz spice-a7b66f77ba091479ced631fb31d7b9ad4fd94775.zip | |
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.
| -rw-r--r-- | client/application.cpp | 4 | ||||
| -rw-r--r-- | server/reds.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/client/application.cpp b/client/application.cpp index bf6591e4..13ff8fa5 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 f9513900..f4263253 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 |