GitoliteExportHosts = re.compile(getattr(ConfModule, "gitoliteexporthosts", "."))
MX_remap = json.loads(ConfModule.MX_remap)
+rtc_realm = getattr(ConfModule, "rtc_realm", None)
+rtc_append = getattr(ConfModule, "rtc_append", None)
+
def prettify(elem):
"""Return a pretty-printed XML string for the Element.
"""
return False
-#def IsGidDebian(account):
-# return account['gidNumber'] == 800
-
# See if this user is in the group list
def IsInGroup(account, allowed, current_host):
# See if the primary group is in the list
Pass = '*'
if 'sudoPassword' in a:
for entry in a['sudoPassword']:
- Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry)
+ Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*-]+) ([^ ]+)$').match(entry)
if Match == None:
continue
uuid = Match.group(1)
if not 'rtcPassword' in a: continue
if not a.pw_active(): continue
- Line = "%s@debian.org:%s:rtc.debian.org:AUTHORIZED" % (a['uid'], str(a['rtcPassword']))
+ Line = "%s%s:%s:%s:AUTHORIZED" % (a['uid'], rtc_append, str(a['rtcPassword']), rtc_realm)
Line = Sanitize(Line) + "\n"
F.write("%s" % (Line))
Algorithm = 1
if Split[0] == 'ssh-dss':
Algorithm = 2
+ if Split[0] == 'ssh-ed25519':
+ Algorithm = 4
if Algorithm == None:
continue
Fingerprint = hashlib.new('sha1', base64.decodestring(Split[1])).hexdigest()
DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, Algorithm, Fingerprint))
+ Fingerprint = hashlib.new('sha256', base64.decodestring(Split[1])).hexdigest()
+ DNSInfo.append("%sIN\tSSHFP\t%u 2 %s" % (TTLprefix, Algorithm, Fingerprint))
if 'architecture' in x[1]:
Arch = GetAttr(x, "architecture")
Mach = ""
if x[1].has_key("machine"):
Mach = " " + GetAttr(x, "machine")
- DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian GNU/Linux"))
+ DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian"))
if x[1].has_key("mXRecord"):
for I in x[1]["mXRecord"]:
accounts_disabled = GenDisabledAccounts(accounts, global_dir + "disabled-accounts")
accounts = filter(lambda x: not IsRetired(x), accounts)
- #accounts_DDs = filter(lambda x: IsGidDebian(x), accounts)
CheckForward(accounts)