X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=93559659a3fa8ebb4b6da11fa8db96d7c0d390da;hb=b48d0155910b67628883d9b9df6852a9cbdf4415;hp=bb923d4f7afe4d00c2911ce021bb170839e72890;hpb=beae461525a08acfb23499301a19afc470021c94;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index bb923d4..9355965 100755 --- 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")