Repository: karaf
Updated Branches:
  refs/heads/master 9641529c1 -> ee4faef99


[KARAF-3704]Command jaas:groupadd allows adding duplicite groups
(cherry picked from commit ef3e11136b23b44c8182b5f445520003119a6b16)
(cherry picked from commit 3d4ed7416b70185a6f046e0336d9f250f2c23dec)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ee4faef9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ee4faef9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ee4faef9

Branch: refs/heads/master
Commit: ee4faef99a8c61e26b378cd87207d45f4a3722b4
Parents: 9641529
Author: Freeman Fang <[email protected]>
Authored: Mon Apr 27 13:45:18 2015 +0800
Committer: Freeman Fang <[email protected]>
Committed: Mon Apr 27 13:48:20 2015 +0800

----------------------------------------------------------------------
 .../karaf/jaas/modules/properties/PropertiesBackingEngine.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ee4faef9/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
----------------------------------------------------------------------
diff --git 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
index 2056871..98e916a 100644
--- 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
+++ 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
@@ -174,6 +174,11 @@ public class PropertiesBackingEngine implements 
BackingEngine {
                     return; 
                 }
             }
+            for (GroupPrincipal gp : listGroups(username)) {
+                if (role.equals(GROUP_PREFIX + gp.getName())) {
+                    return; 
+                }
+            }
             String newUserInfos = userInfos + "," + role;
             users.put(username, newUserInfos);
         }

Reply via email to