From b5656ed1c5c41d0808ede7df7e9fd720143eb834 Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Mon, 11 Jan 2010 19:20:34 +0000
Subject: This is a fix for QPID-2297

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@898016 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/acl/AclReader.cpp | 2 +-
 qpid/cpp/src/tests/acl.py           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/acl/AclReader.cpp b/qpid/cpp/src/qpid/acl/AclReader.cpp
index 8f419a6f50..e2bdbc8ad1 100644
--- a/qpid/cpp/src/qpid/acl/AclReader.cpp
+++ b/qpid/cpp/src/qpid/acl/AclReader.cpp
@@ -522,7 +522,7 @@ void AclReader::printRules() const {
 bool AclReader::checkName(const std::string& name) {
     for (unsigned i=0; i<name.size(); i++) {
         const char ch = name.at(i);
-        if (!std::isalnum(ch) && ch != '-' && ch != '_' && ch != '@') return false;
+        if (!std::isalnum(ch) && ch != '-' && ch != '_' && ch != '@' && ch != '.') return false;
     }
     return true;
 }
diff --git a/qpid/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py
index b27f2f1916..b4dfa557df 100755
--- a/qpid/cpp/src/tests/acl.py
+++ b/qpid/cpp/src/tests/acl.py
@@ -194,13 +194,14 @@ class ACLTests(TestBase010):
         if (result.text.find("contains illegal characters",0,len(result.text)) == -1):
             self.fail(result)
 
-    def test_user_without_realm(self):
+    def test_user_domain(self):
         """
         Test a user defined without a realm
         Ex. group admin rajith
         """
         aclf = ACLFile()
-        aclf.write('group admin bob\n')
+        aclf.write('group test joe@EXAMPLE.com\n') # should be allowed
+        aclf.write('group admin bob\n') # shouldn't be allowed
         aclf.write('acl deny admin bind exchange\n')
         aclf.write('acl allow all all')
         aclf.close()
-- 
cgit v1.2.1