[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.378.2.3, 1.378.2.4 chan_sip.c, 1.913.2.2, 1.913.2.3

[kpfleming]

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

Modified Files:
      Tag: v1-2
	chan_iax2.c chan_sip.c 
Log Message:
backport fix from HEAD branch


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.378.2.3
retrieving revision 1.378.2.4
diff -u -d -r1.378.2.3 -r1.378.2.4
--- chan_iax2.c	21 Nov 2005 13:17:32 -0000	1.378.2.3
+++ chan_iax2.c	21 Nov 2005 19:29:51 -0000	1.378.2.4
@@ -8104,7 +8104,7 @@
 	if (!temponly) {
 		peer = peerl.peers;
 		while(peer) {
-			if (!strcasecmp(peer->name, name)) {	
+			if (!strcmp(peer->name, name)) {	
 				break;
 			}
 			prev = peer;
@@ -8297,7 +8297,7 @@
 	if (!temponly) {
 		user = userl.users;
 		while(user) {
-			if (!strcasecmp(user->name, name)) {	
+			if (!strcmp(user->name, name)) {	
 				break;
 			}
 			prev = user;

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.913.2.2
retrieving revision 1.913.2.3
diff -u -d -r1.913.2.2 -r1.913.2.3
--- chan_sip.c	21 Nov 2005 01:00:51 -0000	1.913.2.2
+++ chan_sip.c	21 Nov 2005 19:29:51 -0000	1.913.2.3
@@ -11967,7 +11967,11 @@
 
 	if (!realtime)
 		/* Note we do NOT use find_peer here, to avoid realtime recursion */
-		peer = ASTOBJ_CONTAINER_FIND_UNLINK(&peerl, name);
+		/* We also use a case-sensitive comparison (unlike find_peer) so
+		   that case changes made to the peer name will be properly handled
+		   during reload
+		*/
+		peer = ASTOBJ_CONTAINER_FIND_UNLINK_FULL(&peerl, name, name, 0, 0, strcmp);
 
 	if (peer) {
 		/* Already in the list, remove it and it will be added back (or FREE'd)  */