[Asterisk-cvs] asterisk/channels chan_iax2.c,1.351,1.352

[markster]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv3831/channels

Modified Files:
	chan_iax2.c 
Log Message:
Don't override calling presentation if *name* is present (bug #5405)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- chan_iax2.c	28 Sep 2005 23:10:13 -0000	1.351
+++ chan_iax2.c	12 Oct 2005 05:12:43 -0000	1.352
@@ -2909,7 +2909,10 @@
 		iax_ie_append_str(&ied, IAX_IE_CALLING_NUMBER, l);
 		iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, c->cid.cid_pres);
 	} else {
-		iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, AST_PRES_NUMBER_NOT_AVAILABLE);
+		if (n)
+			iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, c->cid.cid_pres);
+		else
+			iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, AST_PRES_NUMBER_NOT_AVAILABLE);
 	}
 
 	iax_ie_append_byte(&ied, IAX_IE_CALLINGTON, c->cid.cid_ton);