From: Philippe Antoine Date: Sun, 14 May 2023 15:05:18 +0000 (+0200) Subject: rust/pgsql: remove unused/unconstructed enum variants X-Git-Tag: suricata-7.0.0-rc2~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c466ec5f44fd61077338071dfbee96e05a998cd;p=thirdparty%2Fsuricata.git rust/pgsql: remove unused/unconstructed enum variants --- diff --git a/rust/src/pgsql/logger.rs b/rust/src/pgsql/logger.rs index 43b661805a..03b1ad0f46 100644 --- a/rust/src/pgsql/logger.rs +++ b/rust/src/pgsql/logger.rs @@ -156,24 +156,12 @@ fn log_response(res: &PgsqlBEMessage, jb: &mut JsonBuilder) -> Result<(), JsonEr auth_type: _, payload, }) - | PgsqlBEMessage::AuthenticationGSS(AuthenticationMessage { - identifier: _, - length: _, - auth_type: _, - payload, - }) | PgsqlBEMessage::AuthenticationSSPI(AuthenticationMessage { identifier: _, length: _, auth_type: _, payload, }) - | PgsqlBEMessage::AuthenticationGSSContinue(AuthenticationMessage { - identifier: _, - length: _, - auth_type: _, - payload, - }) | PgsqlBEMessage::AuthenticationSASLFinal(AuthenticationMessage { identifier: _, length: _, @@ -197,7 +185,6 @@ fn log_response(res: &PgsqlBEMessage, jb: &mut JsonBuilder) -> Result<(), JsonEr jb.set_string_from_bytes("payload", payload)?; } PgsqlBEMessage::AuthenticationOk(_) - | PgsqlBEMessage::AuthenticationKerb5(_) | PgsqlBEMessage::AuthenticationCleartextPassword(_) | PgsqlBEMessage::AuthenticationSASL(_) | PgsqlBEMessage::AuthenticationSASLContinue(_) => { diff --git a/rust/src/pgsql/parser.rs b/rust/src/pgsql/parser.rs index bcee6ae9a2..bb1a9ea09e 100644 --- a/rust/src/pgsql/parser.rs +++ b/rust/src/pgsql/parser.rs @@ -233,12 +233,9 @@ pub enum PgsqlBEMessage { ErrorResponse(ErrorNoticeMessage), NoticeResponse(ErrorNoticeMessage), AuthenticationOk(AuthenticationMessage), - AuthenticationKerb5(AuthenticationMessage), AuthenticationCleartextPassword(AuthenticationMessage), AuthenticationMD5Password(AuthenticationMessage), - AuthenticationGSS(AuthenticationMessage), AuthenticationSSPI(AuthenticationMessage), - AuthenticationGSSContinue(AuthenticationMessage), AuthenticationSASL(AuthenticationSASLMechanismMessage), AuthenticationSASLContinue(AuthenticationMessage), AuthenticationSASLFinal(AuthenticationMessage), @@ -260,14 +257,11 @@ impl PgsqlBEMessage { PgsqlBEMessage::ErrorResponse(_) => "error_response", PgsqlBEMessage::NoticeResponse(_) => "notice_response", PgsqlBEMessage::AuthenticationOk(_) => "authentication_ok", - PgsqlBEMessage::AuthenticationKerb5(_) => "authentication_kerb5", PgsqlBEMessage::AuthenticationCleartextPassword(_) => { "authentication_cleartext_password" } PgsqlBEMessage::AuthenticationMD5Password(_) => "authentication_md5_password", - PgsqlBEMessage::AuthenticationGSS(_) => "authentication_gss", PgsqlBEMessage::AuthenticationSSPI(_) => "authentication_sspi", - PgsqlBEMessage::AuthenticationGSSContinue(_) => "authentication_gss_continue", PgsqlBEMessage::AuthenticationSASL(_) => "authentication_sasl", PgsqlBEMessage::AuthenticationSASLContinue(_) => "authentication_sasl_continue", PgsqlBEMessage::AuthenticationSASLFinal(_) => "authentication_sasl_final",