Die(File, None, F)
raise
-# Generate the voipPassword list
-def GenVoipPassword(accounts, File):
+# Generate the rtcPassword list
+def GenRtcPassword(accounts, File):
F = None
try:
OldMask = os.umask(0077)
os.umask(OldMask)
for a in accounts:
- if not 'voipPassword' in a: continue
+ if not 'rtcPassword' in a: continue
if not a.pw_active(): continue
- Line = "%s@debian.org:%s:sip.debian.org:AUTHORIZED" % (a['uid'], str(a['voipPassword']))
+ Line = "%s@debian.org:%s:rtc.debian.org:AUTHORIZED" % (a['uid'], str(a['rtcPassword']))
Line = Sanitize(Line) + "\n"
F.write("%s" % (Line))
"keyFingerPrint", "privateSub", "mailDisableMessage",\
"mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
"mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
- "mailContentInspectionAction", "webPassword", "voipPassword"])
+ "mailContentInspectionAction", "webPassword", "rtcPassword"])
if passwd_attrs is None:
raise UDEmptyList, "No Users"
GenMailList(accounts, global_dir + "mail-rhsbl", "mailRHSBL")
GenMailList(accounts, global_dir + "mail-whitelist", "mailWhitelist")
GenWebPassword(accounts, global_dir + "web-passwords")
- GenVoipPassword(accounts, global_dir + "voip-passwords")
+ GenRtcPassword(accounts, global_dir + "rtc-passwords")
GenKeyrings(global_dir)
# Compatibility.
if 'WEB-PASSWORDS' in ExtraList:
DoLink(global_dir, OutDir, "web-passwords")
- if 'VOIP-PASSWORDS' in ExtraList:
- DoLink(global_dir, OutDir, "voip-passwords")
+ if 'RTC-PASSWORDS' in ExtraList:
+ DoLink(global_dir, OutDir, "rtc-passwords")
if 'KEYRING' in ExtraList:
for k in Keyrings:
need_update = (ldap_last_mod > cache_last_ldap_mod) or (unix_last_mod > cache_last_unix_mod) or (time_started - last_run > MAX_UD_AGE)
- if not options.force and not need_update:
- fd = open(os.path.join(generate_dir, "last_update.trace"), "w")
- fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
- fd.close()
- sys.exit(0)
-
- tracefd = open(os.path.join(generate_dir, "last_update.trace"), "w")
- generate_all(generate_dir, l)
- tracefd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, time_started))
- tracefd.close()
- if options.mq:
- mq_notify(options)
+ fd = open(os.path.join(generate_dir, "last_update.trace"), "w")
+ if need_update or options.force:
+ generate_all(generate_dir, l)
+ if options.mq:
+ mq_notify(options)
+ last_run = int(time.time())
+ fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
+ fd.close()
+ sys.exit(0)
if __name__ == "__main__":