X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=f80820ee71ee130d056d04e8ef64fce8f0f2c174;hb=0a75ce1efcdade4778c6bd431656f5af4a9a740a;hp=6a2fcdd25e26bc89ba50402719cd025b30971c31;hpb=f7e0a25171591b9820a711412cd0780cd6ece12c;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 6a2fcdd..f80820e 100755
--- a/ud-generate
+++ b/ud-generate
@@ -65,12 +65,12 @@ UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)(,\s*([^ <>@]+@[^ ,<>@]+))*$")
 BSMTPCheck = re.compile(".*mx 0 (master)\.debian\.org\..*",re.DOTALL)
 PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
-IsV6Addr = re.compile("^[a-fA-F0-9:]+$")
 IsDebianHost = re.compile(ConfModule.dns_hostmatch)
 isSSHFP = re.compile("^\s*IN\s+SSHFP")
 DNSZone = ".debian.net"
 Keyrings = ConfModule.sync_keyrings.split(":")
 GitoliteSSHRestrictions = getattr(ConfModule, "gitolitesshrestrictions", None)
+MX_remap = json.loads(ConfModule.MX_remap)
 
 def prettify(elem):
    """Return a pretty-printed XML string for the Element.
@@ -818,6 +818,13 @@ def GenDNS(accounts, File):
       raise
    Done(File, F, None)
 
+def is_ipv6_addr(i):
+   try:
+      socket.inet_pton(socket.AF_INET6, i)
+   except socket.error:
+      return False
+   return True
+
 def ExtractDNSInfo(x):
 
    TTLprefix="\t"
@@ -827,7 +834,7 @@ def ExtractDNSInfo(x):
    DNSInfo = []
    if x[1].has_key("ipHostNumber"):
       for I in x[1]["ipHostNumber"]:
-         if IsV6Addr.match(I) != None:
+         if is_ipv6_addr(I):
             DNSInfo.append("%sIN\tAAAA\t%s" % (TTLprefix, I))
          else:
             DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I))
@@ -855,7 +862,11 @@ def ExtractDNSInfo(x):
 
    if x[1].has_key("mXRecord"):
       for I in x[1]["mXRecord"]:
-         DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, I))
+         if I in MX_remap:
+            for e in MX_remap[I]:
+               DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, e))
+         else:
+            DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, I))
 
    return DNSInfo
 
@@ -955,7 +966,7 @@ def HostToIP(Host, mapped=True):
    if Host[1].has_key("ipHostNumber"):
       for addr in Host[1]["ipHostNumber"]:
          IPAdresses.append(addr)
-         if IsV6Addr.match(addr) is None and mapped == "True":
+         if not is_ipv6_addr(addr) and mapped == "True":
             IPAdresses.append("::ffff:"+addr)
 
    return IPAdresses
@@ -1260,6 +1271,12 @@ def generate_host(host, global_dir, all_accounts, ssh_userkeys):
 
    if 'GITOLITE' in ExtraList:
       DoLink(global_dir, OutDir, "ssh-gitolite")
+   if 'exportOptions' in host[1]:
+      for entry in host[1]['exportOptions']:
+         v = entry.split('=',1)
+         if v[0] != 'GITOLITE' or len(v) != 2: continue
+         gitolite_accounts = filter(lambda x: IsInGroup(x, [v[1]], current_host), all_accounts)
+         GenSSHGitolite(gitolite_accounts, OutDir + "ssh-gitolite-%s"%(v[1],))
 
    if 'WEB-PASSWORDS' in ExtraList:
       DoLink(global_dir, OutDir, "web-passwords")