Merged revisions 218223 via svnmerge from

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

........
  r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines

  Ensure we don't pickup ourselves when doing pickup by exten.

  (closes issue #15100)
  Reported by: lmsteffan
  Patches:
        (modified) pickup.patch uploaded by lmsteffan (license 779)
........

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

diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 8a8297e97abcf71788ec4162b5a951b4f97e202b..a6ca09ac5f740fd3362f63c1c6f7dfc94f15cf91 100644 (file)
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -216,7 +216,7 @@ static int pickup_by_exten(struct ast_channel *chan, const char *exten, const ch
 
        while ((target = ast_channel_iterator_next(iter))) {
                ast_channel_lock(target);
-               if (can_pickup(target)) {
+               if ((chan != target) && can_pickup(target)) {
                        break;
                }
                ast_channel_unlock(target);