Fix ACL issue, update CREDITS

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

diff --git a/CREDITS b/CREDITS
index 4ee9df741a2e2c20d0b54696793012718f494892..2466d9339584242ca519c7be195db901b6130286 100755 (executable)
--- a/CREDITS
+++ b/CREDITS
@@ -39,6 +39,9 @@ Ross Finlayson - Dynamic RTP payload support
 Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw file
                format, and various fixes. Can be contacted at mahmut@oa.com.au
 
+=== OTHER CONTRIBUTIONS ===
+John Todd - Monkey sounds and associated teletorture prompt
+
 === OTHER SOURCE CODE IN ASTERISK ===
 
 I did not implement the codecs in asterisk.  Here is the copyright on the

diff --git a/acl.c b/acl.c
index 60d7a36a03c8016bd1a182f5919900b01c9f669a..6a4f4fdaa0ca30cb54aa6e8eb392f1148cfd3058 100755 (executable)
--- a/acl.c
+++ b/acl.c
@@ -118,6 +118,6 @@ int ast_get_ip(struct sockaddr_in *sin, char *value)
 
 int inaddrcmp(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
 {
-       return ((sin1->sin_addr.s_addr == sin2->sin_addr.s_addr )
-                       && (sin1->sin_port == sin2->sin_port));
+       return ((sin1->sin_addr.s_addr != sin2->sin_addr.s_addr )
+                       || (sin1->sin_port != sin2->sin_port));
 }