*** asterisk-1.8x/main/channel.c	2010-08-09 10:48:23.000000000 +0200
--- asterisk-1.8/main/channel.c	2010-08-09 10:57:44.000000000 +0200
***************
*** 1618,1624 ****
  				strcasecmp(chan->macroexten, cmp_args->exten)) {
  			ret = 0; /* exten match failed */
  		}
! 	} else if (!ast_strlen_zero(cmp_args->uniqueid)) {
  		if ((!name_len && strcasecmp(chan->uniqueid, cmp_args->uniqueid)) ||
  				(name_len && strncasecmp(chan->uniqueid, cmp_args->uniqueid, name_len))) {
  			ret = 0; /* uniqueid match failed */
--- 1618,1626 ----
  				strcasecmp(chan->macroexten, cmp_args->exten)) {
  			ret = 0; /* exten match failed */
  		}
! 
! 		} else if (!ast_strlen_zero(cmp_args->uniqueid) && !ast_strlen_zero(chan->uniqueid)) { 
! 
  		if ((!name_len && strcasecmp(chan->uniqueid, cmp_args->uniqueid)) ||
  				(name_len && strncasecmp(chan->uniqueid, cmp_args->uniqueid, name_len))) {
  			ret = 0; /* uniqueid match failed */