Merged revisions 211040 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r211040 | tilghman | 2009-08-07 13:17:41 -0500 (Fri, 07 Aug 2009) | 21 lines

  Merged revisions 211038 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r211038 | tilghman | 2009-08-07 13:16:28 -0500 (Fri, 07 Aug 2009) | 14 lines

    QUEUE_MEMBER_LIST _really_ wants the interface name, not the membername.

    This is a partial revert of revision 82590, which was an attempted cleanup,
    but in reality, it broke QUEUE_MEMBER_LIST, which has always been intended
    as a method by which component interfaces could be queried from the queue.
    Membername isn't useful here, because that field cannot be used to obtain
    further information about the member.  See the documentation on
    QUEUE_MEMBER_LIST, RemoveQueueMember, QUEUE_MEMBER_PENALTY, and the various
    AMI commands which take a member argument for further justification.
    (closes issue #15664)
     Reported by: rain
     Patches:
           app_queue-queue_member_list.diff uploaded by rain (license 327)
  ........
................

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 296edfebb39bbbd6db421dcc6a1db93f8152034d..c5df947e001d5527fb969e00cd8c47b1ca7cbdd5 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -5205,8 +5205,8 @@ static int queue_function_queuememberlist(struct ast_channel *chan, const char *
                                strncat(buf + buflen, ",", len - buflen - 1);
                                buflen++;
                        }
-                       strncat(buf + buflen, m->membername, len - buflen - 1);
-                       buflen += strlen(m->membername);
+                       strncat(buf + buflen, m->interface, len - buflen - 1);
+                       buflen += strlen(m->interface);
                        /* Safeguard against overflow (negative length) */
                        if (buflen >= len - 2) {
                                ao2_ref(m, -1);