[Asterisk-cvs] asterisk/channels chan_sip.c,1.528,1.529

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Fix SIP buglets


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -d -r1.528 -r1.529
--- chan_sip.c	8 Oct 2004 15:52:44 -0000	1.528
+++ chan_sip.c	9 Oct 2004 20:08:41 -0000	1.529
@@ -1098,7 +1098,7 @@
 		}
 		ast_destroy_realtime(var);
 	}
-	return NULL;
+	return peer;
 }
 
 /*--- find_peer: Locate peer by name or ip address */
@@ -5341,12 +5341,15 @@
 		if (user && debug)
 			ast_verbose("Found user '%s'\n", user->name);
 	} else {
-		if (user && debug)
-			ast_verbose("Found user '%s', but fails host access\n", user->name);
+		if (user) {
+			if (debug)
+				ast_verbose("Found user '%s', but fails host access\n", user->name);
+			if (user->temponly)
+				destroy_user(user);
+		}
 		user = NULL;
 	}
-	if (user && user->temponly)
-		destroy_user(user);
+	/* Temp user gets cleaned up at the end */
 	ast_mutex_unlock(&userl.lock);
 	if (!user) {
 		/* If we didn't find a user match, check for peers */
@@ -5429,9 +5432,8 @@
 
 	}
 
-	if (user && user->temponly) {
+	if (user && user->temponly) 
 		destroy_user(user);
-	}
 
 	return res;
 }