mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	Merged revisions 67626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r67626 | file | 2007-06-06 09:16:34 -0400 (Wed, 06 Jun 2007) | 2 lines Include macroexten while searching for a channel to pick up in case they are in a macro. (issue #9491 reported by jamesb63) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -96,7 +96,7 @@ static int pickup_by_exten(struct ast_channel *chan, const char *exten, const ch | ||||
| 	struct ast_channel *target = NULL; | ||||
|  | ||||
| 	while ((target = ast_channel_walk_locked(target))) { | ||||
| 		if (!strcasecmp(target->exten, exten) && | ||||
| 		if ((!strcasecmp(target->macroexten, exten) || !strcasecmp(target->exten, exten)) && | ||||
| 		    !strcasecmp(target->dialcontext, context) && | ||||
| 		    can_pickup(target)) { | ||||
| 			res = pickup_do(chan, target); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user