Merge branch 'maint'

Conflicts:
	doc/appendix/guides/centos.txt
	doc/server/plugins/grouping/metadata.txt
	setup.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py
	src/sbin/bcfg2-lint

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 8ba1944d8..8f6bc5f37 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -154,7 +154,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
         if entry.get("current_exists", "true") == "true":
             # verify supplemental groups
             actual = [g[0] for g in self.user_supplementary_groups(entry)]
-            expected = [e.text for e in entry.findall("MemberOf")]
+            expected = [e.get("group", e.text).strip()
+                        for e in entry.findall("MemberOf")]
             if set(expected) != set(actual):
                 entry.set('qtext',
                           "\n".join([entry.get('qtext', '')] +
@@ -254,7 +255,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
                 if entry.get('uid'):
                     cmd.extend(['-u', entry.get('uid')])
                 cmd.extend(['-g', entry.get('group')])
-                extras = [e.text for e in entry.findall("MemberOf")]
+                extras = [e.get("group", e.text).strip()
+                          for e in entry.findall("MemberOf")]
                 if extras:
                     cmd.extend(['-G', ",".join(extras)])
                 cmd.extend(['-d', entry.get('home')])