rdp: disable rdp by default for 5.0

pull/4188/head
Jason Ish 6 years ago committed by Victor Julien
parent 0f10298990
commit 664605b5f1

@ -22,6 +22,7 @@
use core::{ use core::{
self, AppProto, DetectEngineState, Flow, ALPROTO_UNKNOWN, IPPROTO_TCP, self, AppProto, DetectEngineState, Flow, ALPROTO_UNKNOWN, IPPROTO_TCP,
}; };
use conf;
use nom; use nom;
use parser::*; use parser::*;
use rdp::parser::*; use rdp::parser::*;
@ -532,6 +533,12 @@ pub unsafe extern "C" fn rs_rdp_register_parser() {
get_tx_iterator: None, get_tx_iterator: None,
}; };
/* For 5.0 we want this disabled by default, so check that it
* has been explicitly enabled. */
if !conf::conf_get_bool("app-layer.protocols.rdp.enabled") {
return;
}
let ip_proto_str = std::ffi::CString::new("tcp").unwrap(); let ip_proto_str = std::ffi::CString::new("tcp").unwrap();
if AppLayerProtoDetectConfProtoDetectionEnabled( if AppLayerProtoDetectConfProtoDetectionEnabled(

@ -33,10 +33,6 @@
#include "rust-rdp-rdp-gen.h" #include "rust-rdp-rdp-gen.h"
void RegisterRdpParsers(void) { void RegisterRdpParsers(void) {
/* only register if enabled in config */
if (ConfGetNode("app-layer.protocols.rdp") == NULL) {
return;
}
SCLogDebug("Registering rdp parser"); SCLogDebug("Registering rdp parser");
rs_rdp_register_parser(); rs_rdp_register_parser();
} }

@ -786,8 +786,9 @@ app-layer:
ftp: ftp:
enabled: yes enabled: yes
# memcap: 64mb # memcap: 64mb
# RDP, disabled by default.
rdp: rdp:
enabled: yes #enabled: no
ssh: ssh:
enabled: yes enabled: yes
smtp: smtp:

Loading…
Cancel
Save