res_pjsip_caller_id: Don't overwrite user portion of the From header when fromuser...
authorJoshua Colp <jcolp@digium.com>
Tue, 19 Nov 2013 23:17:57 +0000 (23:17 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 19 Nov 2013 23:17:57 +0000 (23:17 +0000)
commit71612fb0077b3d22895342fdd12beae4862b53ca
tree3091e262c8b9ad89bc7d4410b4fd1d5b4ddd2af0
parent1b14a78d14baf473f594e40a5278cf0e0a70e639
res_pjsip_caller_id: Don't overwrite user portion of the From header when fromuser is set.

The fromuser option is used to explicitly set the user within the From header. The
res_pjsip_caller_id module did not take this setting into account when determining
if the From header could be modified or not.

(closes issue ASTERISK-22866)
Reported by: Anthony Messina
........

Merged revisions 402891 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_pjsip_caller_id.c