diff --git a/gestion/gen_confs/filtrage.py b/gestion/gen_confs/filtrage.py
index a92a3240..db295ade 100644
--- a/gestion/gen_confs/filtrage.py
+++ b/gestion/gen_confs/filtrage.py
@@ -18,7 +18,7 @@ import lc_ldap.objets
 from gestion.gen_confs import gen_config
 import psycopg2
 
-ldap_conn = lc_ldap.shortcuts.lc_ldap.readonly()
+ldap_conn = lc_ldap.shortcuts.lc_ldap_readonly()
 
 # Génération des la tables d'exemptions
 #######################################
@@ -32,7 +32,7 @@ class exemptions(gen_config):
         return "surveillance_exemptions"
 
     def _gen(self):
-        machines = ldap_conn.search(u'(exempt=*)')
+        machines = ldap_conn.search(u'(exempt=*)', sizelimit=9999)
         pgsql = psycopg2.connect(database='filtrage', user='crans')
         curseur = pgsql.cursor()
 
@@ -68,7 +68,7 @@ class machines(gen_config):
         return "surveillance_liste_machines"
 
     def _gen(self):
-        machines = ldap_conn.search(u"(ipHostNumber=*)")['machine']
+        machines = ldap_conn.search(u"(ipHostNumber=*)", sizelimit=9999)
 
         # liste des machines (on prend que les paimement ok)
         # machines = self.machines
@@ -82,11 +82,13 @@ class machines(gen_config):
         # ajout des entrée
         for m in machines:
             if m.proprio().__class__ == lc_ldap.objets.club:
-                curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','club',%s);" % (m['macAddress'][0], m.proprio()['cid'][0].value))
+		if not m['macAddress'][0].value == '<automatique>':
+		    curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','club',%s);" % (m['macAddress'][0], m.proprio()['cid'][0].value))
             elif m.proprio().__class__ == lc_ldap.objets.adherent:
-                curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','adherent',%s);" % (m['macAddress'], m.proprio()['cid'][0].value))
+		if not m['macAddress'][0].value == '<automatique>':
+		    curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','adherent',%s);" % (m['macAddress'][0], m.proprio()['aid'][0].value))
             elif m.proprio().__class__ == lc_ldap.objets.AssociationCrans:
-                curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','crans',%s);" % (m['macAddress'], m['mid'][0].value))
+                curseur.execute("INSERT INTO machines (mac_addr, type, id) VALUES ('%s','crans',%s);" % (m['macAddress'][0], m['mid'][0].value))
         # on commit
         pgsql.commit()