X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=06f861f46becd205a10056845c234a58de3dfc1c;hb=8d2ecf180bc525c59b2ddd40d36daa833623e0b0;hp=0a6e9818f182ad40d1beedc535af67045c7260ef;hpb=1bd1a3c991bde81e15d751542676f76f104bd2f8;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 0a6e981..06f861f 100755 --- a/ud-generate +++ b/ud-generate @@ -534,10 +534,9 @@ def GenForward(File): # Write out the email address for each user for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0: - continue - - Line = "%s: %s" % (GetAttr(x, "uid"), GetAttr(x, "emailForward")) + a = UDLdap.Account(x[0], x[1]) + if not 'emailForward' in a: continue + Line = "%s: %s" % (a['uid'], a['emailForward']) Line = Sanitize(Line) + "\n" F.write(Line)