rdp: enable by default

Redmine issue:
https://redmine.openinfosecfoundation.org/issues/3255
pull/5012/head
Jason Ish 6 years ago committed by Victor Julien
parent 3eb0461abd
commit 6ce9b2972b

@ -22,7 +22,6 @@
use crate::core::{ use crate::core::{
self, AppProto, DetectEngineState, Flow, ALPROTO_UNKNOWN, IPPROTO_TCP, self, AppProto, DetectEngineState, Flow, ALPROTO_UNKNOWN, IPPROTO_TCP,
}; };
use crate::conf;
use nom; use nom;
use crate::applayer::*; use crate::applayer::*;
use crate::rdp::parser::*; use crate::rdp::parser::*;
@ -537,12 +536,6 @@ pub unsafe extern "C" fn rs_rdp_register_parser() {
set_tx_detect_flags: None, set_tx_detect_flags: 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(

@ -156,9 +156,6 @@ static TmEcode JsonRdpLogThreadDeinit(ThreadVars *t, void *data)
void JsonRdpLogRegister(void) void JsonRdpLogRegister(void)
{ {
if (ConfGetNode("app-layer.protocols.rdp") == NULL) {
return;
}
/* Register as an eve sub-module. */ /* Register as an eve sub-module. */
OutputRegisterTxSubModule( OutputRegisterTxSubModule(
LOGGER_JSON_RDP, LOGGER_JSON_RDP,

@ -257,7 +257,7 @@ outputs:
#- dnp3 #- dnp3
- ftp - ftp
#- rdp - rdp
- nfs - nfs
- smb - smb
- tftp - tftp
@ -745,9 +745,8 @@ app-layer:
ftp: ftp:
enabled: yes enabled: yes
# memcap: 64mb # memcap: 64mb
# RDP, disabled by default.
rdp: rdp:
#enabled: no #enabled: yes
ssh: ssh:
enabled: yes enabled: yes
smtp: smtp:

Loading…
Cancel
Save