[svn-commits] kmoore: branch 12 r400440 - in /branches/12: ./ main/security_events.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Oct  3 14:29:49 2013
New Revision: 400440

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400440
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/main/security_events.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/security_events.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/security_events.c?view=diff&rev=400440&r1=400439&r2=400440
==============================================================================
--- branches/12/main/security_events.c (original)
+++ branches/12/main/security_events.c Thu Oct  3 14:29:49 2013
@@ -380,14 +380,14 @@
 		{ 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_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 }
-	},
-	.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_END, 0 }
 	},
 },