[Asterisk-cvs] asterisk/channels chan_iax2.c,1.91.2.7,1.91.2.8

[citats at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	chan_iax2.c 
Log Message:
These 2 lines of code got inserted into the exact same line in -head and
-stable, but was out of place in -stable.  This moves it to the same
place as in -head.


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.91.2.7
retrieving revision 1.91.2.8
diff -u -d -r1.91.2.7 -r1.91.2.8
--- chan_iax2.c	4 Mar 2004 23:44:26 -0000	1.91.2.7
+++ chan_iax2.c	5 Mar 2004 08:58:25 -0000	1.91.2.8
@@ -1891,6 +1891,8 @@
 	if (!secret && strlen(storedsecret))
 		secret = storedsecret;
 	ast_mutex_lock(&iaxsl[callno]);
+	if (strlen(c->context))
+		strncpy(iaxs[callno]->context, c->context, sizeof(iaxs[callno]->context));
 	if (secret) {
 		if (secret[0] == '[') {
 			/* This is an RSA key, not a normal secret */
@@ -2122,8 +2124,6 @@
 						/* Take out of conference mode */
 						res = 0;
 						/* Remove from native mode */
-	if (strlen(c->context))
-		strncpy(iaxs[callno]->context, c->context, sizeof(iaxs[callno]->context));
 						break;
 					} else 
 						goto tackygoto;