From ae261198e5028a3faf50ceb476c9afea8dbbcebd Mon Sep 17 00:00:00 2001 From: Andrew Colin Kissa Date: Sun, 21 Oct 2012 16:07:07 +0200 Subject: [PATCH 2/3] * fix radius authentication bugs Signed-off-by: Andrew Colin Kissa --- src/baruwa/auth/radius.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/baruwa/auth/radius.py b/src/baruwa/auth/radius.py index 220a9e0..0f67fca 100644 --- a/src/baruwa/auth/radius.py +++ b/src/baruwa/auth/radius.py @@ -60,7 +60,7 @@ class RadiusAuth: if not dom: return None - hosts = MailAuthHost.objects.filter(useraddress=dom, protocol=3) + hosts = MailAuthHost.objects.filter(useraddress=dom, protocol=4) if not hosts: return None @@ -75,7 +75,7 @@ class RadiusAuth: secret=settings.RADIUS_SECRET[host.address].encode('utf-8'), dict=Dictionary(StringIO(DICTIONARY)),) except AttributeError: - return None + continue request = client.CreateAuthPacket(code=packet.Accessrequest, User_Name=login_user,) @@ -84,9 +84,9 @@ class RadiusAuth: reply = client.SendPacket(request) if (reply.code == packet.AccessReject or reply.code != packet.AccessAccept): - return None + continue except (Timeout, Exception): - return None + continue try: user = User.objects.get(username=username) except User.DoesNotExist: -- 1.7.5.4