automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-19 13:01:18 +00:00
parent daeb228bb3
commit 9ae33412c5

View File

@@ -3841,7 +3841,7 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
return 0;
}
cid = ast_variable_retrieve(msg_cfg, "message", "callerid");
cid = ast_strdupa(ast_variable_retrieve(msg_cfg, "message", "callerid"));
duration = ast_variable_retrieve(msg_cfg, "message", "duration");
category = ast_variable_retrieve(msg_cfg, "message", "category");
@@ -6462,7 +6462,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
return 0;
}
cid = ast_variable_retrieve(msg_cfg, "message", "callerid");
cid = ast_strdupa(ast_variable_retrieve(msg_cfg, "message", "callerid"));
context = ast_variable_retrieve(msg_cfg, "message", "context");
if (!strncasecmp("macro",context,5)) /* Macro names in contexts are useless for our needs */