X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=ud-generate;h=774e03272b53ec81180c59eaddcbe437fdd3d65a;hb=refs%2Ftags%2Fuserdir-ldap-0.3.32;hp=b331c315ab7438ac4dadf7fea0350f13272bbe7d;hpb=7903fe558aa8ef3f5b3494b27eddce0a9a0ce1ef;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index b331c31..774e032 100755 --- a/ud-generate +++ b/ud-generate @@ -38,8 +38,7 @@ CurrentHost = ""; EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$"); BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL); DNSZone = ".debian.net" -Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg", - "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ] +Keyrings = ConfModule.sync_keyrings.split(":") def safe_makedirs(dir): try: @@ -183,12 +182,12 @@ def GenShadow(l,File): or GetAttr(x,"userPassword").startswith("!"): ShadowExpire = '1' else: - ShadowExpire = GetAttr(x,"shadowexpire") + ShadowExpire = GetAttr(x,"shadowExpire") Line = "%s:%s:%s:%s:%s:%s:%s:%s:" % (GetAttr(x,"uid"),\ Pass,GetAttr(x,"shadowLastChange"),\ GetAttr(x,"shadowMin"),GetAttr(x,"shadowMax"),\ - GetAttr(x,"shadowWarning"),GetAttr(x,"shadowinactive"),\ + GetAttr(x,"shadowWarning"),GetAttr(x,"shadowInactive"),\ ShadowExpire); Line = Sanitize(Line) + "\n"; F.write("0%u %s" % (I,Line)); @@ -516,18 +515,11 @@ def GenMailDisable(l,File): for x in PasswdAttrs: Reason = None - - # If the account is locked, disable incoming mail - if (GetAttr(x,"userPassword").find("*LK*") != -1): - if GetAttr(x,"uid") == "luther": - continue - else: - Reason = "user account locked" + + if x[1].has_key("mailDisableMessage"): + Reason = GetAttr(x,"mailDisableMessage") else: - if x[1].has_key("mailDisableMessage"): - Reason = GetAttr(x,"mailDisableMessage") - else: - continue + continue # Must be in the Debian group (yuk, hard coded for now) if GetAttr(x,"gidNumber") != "800": @@ -856,7 +848,7 @@ def GenKeyrings(l,OutDir): shutil.copy(k, OutDir) # Connect to the ldap server -l = ldap.open(LDAPServer); +l = connectLDAP() F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); Pass = F.readline().strip().split(" ") F.close(); @@ -877,8 +869,8 @@ for x in Attrs: PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\ ["uid","uidNumber","gidNumber","supplementaryGid",\ "gecos","loginShell","userPassword","shadowLastChange",\ - "shadowMin","shadowMax","shadowWarning","shadowinactive", - "shadowexpire","emailForward","latitude","longitude",\ + "shadowMin","shadowMax","shadowWarning","shadowInactive", + "shadowExpire","emailForward","latitude","longitude",\ "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\ "keyFingerPrint","privateSub","mailDisableMessage",\ "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\