Merged revisions 189464 via svnmerge from

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

................
  r189464 | seanbright | 2009-04-20 17:09:59 -0400 (Mon, 20 Apr 2009) | 20 lines
  
  Merged revisions 189462 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189462 | seanbright | 2009-04-20 16:58:39 -0400 (Mon, 20 Apr 2009) | 13 lines
    
    Properly handle @s within hints in AEL.
    
    AEL was not handling the case of a device hint containing an @ symbol, which
    caused parking hints (e.g. hint(park:exten@context)) to error out the parser.
    This patch makes AEL treat the @ the same way it treats colon and ampersand
    now, meaning the characters are included in verbatim.
    
    (closes issue #14941)
    Reported by: bpgoldsb
    Patches:
          bug14941.patch uploaded by seanbright (license 71)
    Tested by: bpgoldsb
  ........
................


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

res/ael/ael.y

@@ -402,6 +402,15 @@ hint_word : word { $$ = $1; }
 			free($3);
 		}
 	}
+	| hint_word AT word {
+		if (asprintf(&($$), "%s@%s", $1, $3) < 0) {
+			ast_log(LOG_WARNING, "asprintf() failed\n");
+			$$ = NULL;
+		} else {
+			free($1);
+			free($3);
+		}
+	}
 	;
 
 word3_list : word { $$ = $1;}