From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 5 Aug 2007 03:42:35 +0000 (+0000)
Subject: Merged revisions 78139 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1810
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05d60c7860e25c8d2b951c8b2864621581378bb5;p=thirdparty%2Fasterisk.git

Merged revisions 78139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78139 | tilghman | 2007-08-04 22:29:01 -0500 (Sat, 04 Aug 2007) | 2 lines

If peer is not found, the error message is misleading (should be peer not found, not ACL failure)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f2f031e3ae..a960e9deb1 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9130,10 +9130,12 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr
 	peer = find_peer(name, NULL, 1);
 	if (!(peer && ast_apply_ha(peer->ha, sin))) {
 		/* Peer fails ACL check */
-		if (peer)
+		if (peer) {
 			unref_peer(peer);
-		peer = NULL;
-		res = AUTH_ACL_FAILED;
+			peer = NULL;
+			res = AUTH_ACL_FAILED;
+		} else
+			res = AUTH_NOT_FOUND;
 	}
 	if (peer) {
 		/* Set Frame packetization */