[Asterisk-cvs] asterisk/channels chan_sip.c,1.641,1.642

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Fix CID name when no CID name is supplied (bug #2795)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -d -r1.641 -r1.642
--- chan_sip.c	28 Jan 2005 03:49:08 -0000	1.641
+++ chan_sip.c	28 Jan 2005 05:38:16 -0000	1.642
@@ -2014,10 +2014,10 @@
 		tmp->callgroup = i->callgroup;
 		tmp->pickupgroup = i->pickupgroup;
 		tmp->cid.cid_pres = i->callingpres;
-                if (!ast_strlen_zero(i->accountcode))
-                        strncpy(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode)-1);
-                if (i->amaflags)
-                        tmp->amaflags = i->amaflags;
+		if (!ast_strlen_zero(i->accountcode))
+			strncpy(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode)-1);
+		if (i->amaflags)
+			tmp->amaflags = i->amaflags;
 		if (!ast_strlen_zero(i->language))
 			strncpy(tmp->language, i->language, sizeof(tmp->language)-1);
 		if (!ast_strlen_zero(i->musicclass))
@@ -5606,7 +5606,7 @@
 				strncpy(p->cid_num, user->cid_num, sizeof(p->cid_num) - 1);
 				ast_shrink_phone_number(p->cid_num);
 			}
-			if (!ast_strlen_zero(user->cid_name) && !ast_strlen_zero(p->cid_name)) 
+			if (!ast_strlen_zero(user->cid_name) && !ast_strlen_zero(p->cid_num)) 
 				strncpy(p->cid_name, user->cid_name, sizeof(p->cid_name) - 1);
 			strncpy(p->username, user->name, sizeof(p->username) - 1);
 			strncpy(p->peersecret, user->secret, sizeof(p->peersecret) - 1);