automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-04-13 16:06:43 +00:00
parent 54e190dacb
commit b64b6ef1f7

3
pbx.c
View File

@@ -1023,7 +1023,8 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
*ret = workspace;
} else
*ret = NULL;
}
} else
goto icky;
} else if (!strcmp(var + 6, "ANI")) {
/* CALLERANI */
if (c->cid.cid_ani) {