Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.587
diff -u -r1.587 chan_sip.c
--- channels/chan_sip.c 9 Dec 2004 14:54:13 -0000       1.587
+++ channels/chan_sip.c 10 Dec 2004 23:51:40 -0000
@@ -8414,7 +8414,8 @@
        if (peer) {
                peer->lastmsgssent = -1;
                if (!found) {
-                       strncpy(peer->name, name, sizeof(peer->name)-1);
+                       if (name)
+                               strncpy(peer->name, name, sizeof(peer->name)-1);
                        strncpy(peer->context, default_context, sizeof(peer->context)-1);
                        strncpy(peer->language, default_language, sizeof(peer->language)-1);
                        strncpy(peer->musicclass, global_musicclass, sizeof(peer->musicclass)-1);
@@ -8441,7 +8442,9 @@
                peer->ospauth = global_ospauth;
 #endif
                while(v) {
-                       if (!strcasecmp(v->name, "secret"))
+                       if (!strcasecmp(v->name, "name"))
+                               strncpy(peer->name, v->value, sizeof(peer->name)-1);
+                       else if (!strcasecmp(v->name, "secret"))
                                strncpy(peer->secret, v->value, sizeof(peer->secret)-1);
                        else if (!strcasecmp(v->name, "md5secret"))
                                strncpy(peer->md5secret, v->value, sizeof(peer->md5secret)-1);