automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bff2100d71407b2e27dfc0d5d00e2153af1d7893..a1ce6907b3f6747b5e0591e558bc98fe726bf29d 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4813,10 +4813,10 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
        }
        ast_mutex_unlock(&userl.lock);
        user = best;
-       if (!user && !ast_strlen_zero(iaxs[callno]->username) && (strlen(iaxs[callno]->username) < 128)) {
+       if (!user && !ast_strlen_zero(iaxs[callno]->username)) {
                user = realtime_user(iaxs[callno]->username);
                if (user && !ast_strlen_zero(iaxs[callno]->context) &&                  /* No context specified */
-                            !apply_context(user->contexts, iaxs[callno]->context)) {                   /* Context is permitted */
+                   !apply_context(user->contexts, iaxs[callno]->context)) {            /* Context is permitted */
                        destroy_user(user);
                        user = NULL;
                }