diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-25 16:53:35 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2011-02-10 20:55:07 +0100 |
| commit | bc3b9f7e58a8c8c5215eae26fad7b86aed4226e5 (patch) | |
| tree | 0e38d8b1e77304b0ac3ab57fc37afcce43b0fd84 | |
| parent | 112436e5752c452719360b2332efcc89cd856ce4 (diff) | |
| download | spice-bc3b9f7e58a8c8c5215eae26fad7b86aed4226e5.tar.gz spice-bc3b9f7e58a8c8c5215eae26fad7b86aed4226e5.tar.xz spice-bc3b9f7e58a8c8c5215eae26fad7b86aed4226e5.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 8d5264b4..c416097c 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -1898,7 +1898,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 if (!strcmp(val, "all")) { if ((val = parser.next_argument())) { @@ -2057,7 +2059,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 if (!strcmp(val, "all")) { if ((val = parser.next_argument())) { diff --git a/server/reds.c b/server/reds.c index 7ab49254..e8a783d6 100644 --- a/server/reds.c +++ b/server/reds.c @@ -3948,7 +3948,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 }; int i; |