ensure that user events are correctly identified (issue #5200)

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

diff --git a/CHANGES b/CHANGES
index 381d6837110fb80ad9cefee5ffc5a45857b9486e..de43197dd3ef12c37b775527cd2b86c8f70ce88c 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,10 @@
  -- app_meetme
     -- If the first caller into a conference hangs up while being prompted for
        the conference pin number, the conference will no longer be held open.
+ -- app_userevent
+    -- Events created with this application were indicated as a "call" event
+       instead of a "user" event.  This made the "user" event permissions
+       not work correctly.
  -- app_voicemail
     -- When using the externpass option for voicemail, the password will be
        immediately updated in memory as well, instead of having to wait for

diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 82de783b324a1c656d998a734896fba1d9387a2c..3b3cfc8caeee4a1e57ac59bf6c0ba1c5f00fa1bc 100755 (executable)
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -64,12 +64,12 @@ static int userevent_exec(struct ast_channel *chan, void *data)
 
        if(eventbody) {
             ast_log(LOG_DEBUG, "Sending user event: %s, %s\n", eventname, eventbody);
-            manager_event(EVENT_FLAG_CALL, eventname, 
+            manager_event(EVENT_FLAG_USER, eventname, 
                        "Channel: %s\r\nUniqueid: %s\r\n%s\r\n",
                        chan->name, chan->uniqueid, eventbody);
        } else {
             ast_log(LOG_DEBUG, "Sending user event: %s\n", eventname);
-            manager_event(EVENT_FLAG_CALL, eventname, 
+            manager_event(EVENT_FLAG_USER, eventname, 
                        "Channel: %s\r\nUniqueid: %s\r\n", chan->name, chan->uniqueid);
        }