make a stab at really not exporting empty groups

[mirror/userdir-ldap.git] / ud-generate

diff --git a/ud-generate b/ud-generate
index bb923d4..9355965 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -446,9 +446,15 @@ def GenGroup(File):
       # Output the group file.
       J = 0
       for x in GroupMap.keys():
-         grouprevmap[GroupIDMap[x]] = x
+
+         if len(GroupMap[x]) == 0:
+            continue
+
          if GroupIDMap.has_key(x) == 0:
             continue
+
+         grouprevmap[GroupIDMap[x]] = x
+
          Line = "%s:x:%u:" % (x, GroupIDMap[x])
          Comma = ''
          for I in GroupMap[x]:
@@ -1181,6 +1187,8 @@ for host in HostAttrs:
    DoLink(GlobalDir, OutDir, "mail-rhsbl")
    DoLink(GlobalDir, OutDir, "mail-whitelist")
    GenCDB(OutDir + "user-forward.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'emailForward')
+   GenCDB(OutDir + "batv-tokens.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'bATVToken')
+   GenCDB(OutDir + "default-mail-options.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'mailDefaultOptions')
 
    # Compatibility.
    DoLink(GlobalDir, OutDir, "forward-alias")