Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.518
diff -u -p -r1.518 chan_sip.c
--- chan_sip.c	4 Oct 2004 13:03:53 -0000	1.518
+++ chan_sip.c	4 Oct 2004 16:59:58 -0000
@@ -1062,7 +1062,9 @@ static struct sip_user *mysql_user(char 
 						} else if (!strcasecmp(fields[x].name, "callingpres")) {
 							u->callingpres = atoi(rowval[x]);
 						} else if (!strcasecmp(fields[x].name, "callerid")) {
-							strncpy(u->callerid, rowval[x], sizeof(u->callerid) - 1);
+							ast_callerid_split(rowval[x],
+								u->cid_name, sizeof(u->cid_name),
+								u->cid_num, sizeof(u->cid_num));
 							u->hascallerid=1;
 						}
 					}