X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=49ef0d0905425a70548fc3dfa4d296a20cf558b7;hb=c181bee3c0c130ebb7b1640573a4e9ba171d2ac8;hp=b377f3190a1989e9c7098e8e1e626502dcd6e78d;hpb=6e0774c6d01746bdf3677a230fcfa75839b58c61;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index b377f31..49ef0d0 100755
--- a/ud-generate
+++ b/ud-generate
@@ -1105,7 +1105,8 @@ def get_accounts(ldap_conn):
                     "keyFingerPrint", "privateSub", "mailDisableMessage",\
                     "mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\
                     "mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\
-                    "mailContentInspectionAction", "webPassword", "rtcPassword"])
+                    "mailContentInspectionAction", "webPassword", "rtcPassword",\
+                    "bATVToken"])
 
    if passwd_attrs is None:
       raise UDEmptyList, "No Users"
@@ -1400,7 +1401,7 @@ def mq_notify(options, message):
 
    msg = {
       'message': message,
-      timestamp: int(time.time())
+      'timestamp': int(time.time())
    }
    conn = None
    try:
@@ -1419,8 +1420,6 @@ def ud_generate():
      help="Output directory.")
    parser.add_option("-f", "--force", dest="force", action="store_true",
      help="Force generation, even if no update to LDAP has happened.")
-   parser.add_option("-m", "--mq", action="store_true", default=False,
-     help="Send update trigger over MQ")
 
    (options, args) = parser.parse_args()
    if len(args) > 0:
@@ -1454,8 +1453,7 @@ def ud_generate():
    if need_update or options.force:
       msg = 'Update forced' if options.force else 'Update needed'
       generate_all(generate_dir, l)
-      if options.mq:
-         mq_notify(options, msg)
+      mq_notify(options, msg)
       last_run = int(time.time())
    fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
    fd.close()