Fix security events for AMI invalid password

In r337595, additional security events were added for chan_sip
authentication failures. The new IEs added to the existing invalid
password event were defined as required IEs, but existing users of the
event did not set the new IEs and could not since they didn't apply to
existing uses. They are now marked as optional IEs.

(closes issue ASTERISK-22578)
Reported by: Matt Jordan
........

Merged revisions 400421 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@400440 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/security_events.c b/main/security_events.c
index d115472917e9dd243bde4b99b348de68019b132c..d10338984a49246850ec8ee33c363b97f1e5af8c 100644 (file)
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -380,14 +380,14 @@ static const struct {
                { AST_EVENT_IE_SESSION_ID, SEC_EVT_FIELD(common, session_id) },
                { AST_EVENT_IE_LOCAL_ADDR, SEC_EVT_FIELD(common, local_addr) },
                { AST_EVENT_IE_REMOTE_ADDR, SEC_EVT_FIELD(common, remote_addr) },
-               { AST_EVENT_IE_CHALLENGE, SEC_EVT_FIELD(inval_password, challenge) },
-               { AST_EVENT_IE_RECEIVED_CHALLENGE, SEC_EVT_FIELD(inval_password, received_challenge) },
-               { AST_EVENT_IE_RECEIVED_HASH, SEC_EVT_FIELD(inval_password, received_hash) },
                { AST_EVENT_IE_END, 0 }
        },
        .optional_ies = {
                { AST_EVENT_IE_MODULE, SEC_EVT_FIELD(common, module) },
                { AST_EVENT_IE_SESSION_TV, SEC_EVT_FIELD(common, session_tv) },
+               { AST_EVENT_IE_CHALLENGE, SEC_EVT_FIELD(inval_password, challenge) },
+               { AST_EVENT_IE_RECEIVED_CHALLENGE, SEC_EVT_FIELD(inval_password, received_challenge) },
+               { AST_EVENT_IE_RECEIVED_HASH, SEC_EVT_FIELD(inval_password, received_hash) },
                { AST_EVENT_IE_END, 0 }
        },
 },