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.
This commit is contained in:
Alon Levy 2011-01-25 16:53:35 +02:00 committed by Hans de Goede
parent 112436e575
commit bc3b9f7e58
2 changed files with 6 additions and 0 deletions

View File

@ -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())) {

View File

@ -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;