Merged revisions 284967 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284967 | bbryant | 2010-09-03 14:19:53 -0400 (Fri, 03 Sep 2010) | 15 lines

  Merged revisions 284958 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r284958 | bbryant | 2010-09-03 14:15:49 -0400 (Fri, 03 Sep 2010) | 8 lines

    This is a patch provided for issue #17935 to add the ActionID to the IAXregistry AMI response.

    (closes issue #17935)
    Reported by: alexkuklin
    Patches:
          iaxshowreg uploaded by alexkuklin (license 1115)
    Tested by: alexkuklin
  ........
................

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 90ae4eef53a1d2a83829bbae5cf30fef05e89808..73c070d8109729823ff2b7b361f1c7b75f9afabb 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -7047,13 +7047,14 @@ static int manager_iax2_show_registry(struct mansession *s, const struct message
                
                astman_append(s,
                        "Event: RegistryEntry\r\n"
+                       "%s"
                        "Host: %s\r\n"
                        "DNSmanager: %s\r\n"
                        "Username: %s\r\n"
                        "Perceived: %s\r\n"
                        "Refresh: %d\r\n"
                        "State: %s\r\n"
-                       "\r\n", host, (reg->dnsmgr) ? "Y" : "N", reg->username, perceived, 
+                       "\r\n", idtext, host, (reg->dnsmgr) ? "Y" : "N", reg->username, perceived, 
                        reg->refresh, regstate2str(reg->regstate));
 
                total++;