From: Automerge script <automerge@asterisk.org>
Date: Fri, 13 Oct 2006 23:01:13 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.13-netsec~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2489f463655405e645075e29803e51377ec70762;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/acl.c b/acl.c
index 326cdb66d6..bef6ea7cce 100644
--- a/acl.c
+++ b/acl.c
@@ -176,12 +176,12 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
 		} else if (!inet_aton(nm, &ha->netmask)) {
 			ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm);
 			free(ha);
-			return path;
+			return ret;
 		}
 		if (!inet_aton(tmp, &ha->netaddr)) {
 			ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp);
 			free(ha);
-			return path;
+			return ret;
 		}
 		ha->netaddr.s_addr &= ha->netmask.s_addr;
 		if (!strncasecmp(sense, "p", 1)) {