Index: channels/chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.32
diff -i -r1.32 chan_mgcp.c
499c499
< 		transmit_notify_request_with_callerid(sub, tone, ast->callerid);
---
> 		transmit_notify_request_with_callerid(sub, tone, !ast->restrictcid ? ast->callerid : "");
1808a1809
> 		    chan->restrictcid = p->hidecallerid;
1810,1811c1811
<                         if (!p->hidecallerid)
<                             chan->callerid = strdup(p->callerid);
---
>                         chan->callerid = strdup(p->callerid);
1868,1870d1867
<             if (chan->callerid)
<                 free(chan->callerid);
<             chan->callerid = NULL;