[Collab-qa-commits] r1765 - udd/udd

[Lucas Nussbaum]

Author: lucas
Date: 2010-08-02 18:38:12 +0000 (Mon, 02 Aug 2010)
New Revision: 1765

Modified:
   udd/udd/carnivore_gatherer.py
Log:
understand DMs in carnivore (thanks raphael)

Modified: udd/udd/carnivore_gatherer.py
===================================================================
--- udd/udd/carnivore_gatherer.py	2010-08-02 18:15:59 UTC (rev 1764)
+++ udd/udd/carnivore_gatherer.py	2010-08-02 18:38:12 UTC (rev 1765)
@@ -24,6 +24,7 @@
     "Key in ldap":     {"name": "ldap_key", "content-type": "multiple entries"},
     "Key in emeritus": {"name": "emeritus_key", "content-type": "multiple entries"},
     "Key in removed":  {"name": "removed_key", "content-type": "multiple entries"},
+    "Key in dm":       {"name": "dm_key", "content-type": "multiple entries"},
   }
 
   def __init__(self, connection, config, source):
@@ -76,7 +77,7 @@
             qs.append("EXECUTE carnivore_name_insert (%d, %s)" % (record_number, quote(name)))
           if "login" in record:
             qs.append("EXECUTE carnivore_login_insert (%d, %s)" % (record_number, quote(record["login"])))
-          for key_type in ['keyring', 'ldap', 'emeritus', 'removed']:
+          for key_type in ['keyring', 'ldap', 'emeritus', 'removed', 'dm']:
             if ("%s_key" % key_type) in record:
               for key in record["%s_key" % key_type]:
                 qs.append("EXECUTE carnivore_keys_insert (%d, %s, '%s')" % (record_number, quote(key), key_type))