Merged revisions 239571 via svnmerge from

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

........
  r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines

  Blank callerid and NULL callerid should not compare equal.
  The second is the default state for matching CID in the dialplan (no matching)
  while the first matches one particular CallerID.  This is a regression.
  (fixes AST-314, SWP-611)
........

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

diff --git a/main/pbx.c b/main/pbx.c
index 2103f39ca7af3d2303ed08b8b1591d9586a6cd61..fac0cdafc4e1cfdc2481855c85520ec259916353 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6841,7 +6841,9 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
        p += ext_strncpy(p, extension, strlen(extension) + 1) + 1;
        tmp->priority = priority;
        tmp->cidmatch = p;      /* but use p for assignments below */
-       if (!ast_strlen_zero(callerid)) {
+
+       /* Blank callerid and NULL callerid are two SEPARATE things.  Do NOT confuse the two!!! */
+       if (callerid) {
                p += ext_strncpy(p, callerid, strlen(callerid) + 1) + 1;
                tmp->matchcid = 1;
        } else {