From fcda8784c9eaf8936832a4672cfe8f68290866c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Mon, 8 Apr 2013 10:00:29 +0200
Subject: [PATCH] [config/nolslib/mac_prises] Corrections

---
 gestion/config/config.py                      | 7 +++++--
 gestion/iscsi/nolslib.py                      | 3 ++-
 surveillance/mac_prises/mac_prise_analyzer.py | 2 +-
 surveillance/mac_prises/mac_prise_reperage.py | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gestion/config/config.py b/gestion/config/config.py
index 0b423d62..cc16983f 100644
--- a/gestion/config/config.py
+++ b/gestion/config/config.py
@@ -169,7 +169,9 @@ NETs_regexp = { 'all' : '^138\.231\.1(3[6789]|4[0123456789]|5[01])\.\d+$' }
 # ci-dessus...
 rid = {
     # Rid pour les machines fixes
-    'fil' : (256, 2047),
+    'adherents' : (256, 2047),
+    # Rid pour les machines filaire ipv4
+    'fil' : (0, 2047),
     # Rid pour les machines wifi
     'wifi' : (2048, 4095),
     # Rid pour les machines du vlan adm
@@ -205,7 +207,8 @@ ipv6_machines_speciales = {
 
 # Les préfixes ipv6
 prefix = {  'subnet' : [ '2a01:240:fe3d::/48' ],
-            'serveurs' : [ '2a01:240:fe3d:4::/64'],
+            'serveurs' : [ '2a01:240:fe3d:4::/64' ],
+            'adherents' : [ '2a01:240:fe3d:4::/64' ],
             'fil' : [ '2a01:240:fe3d:4::/64' ],
             'adm' : [ '2a01:240:fe3d:c804::/64' ],
             'wifi' : [ '2a01:240:fe3d:c04::/64' ],
diff --git a/gestion/iscsi/nolslib.py b/gestion/iscsi/nolslib.py
index c37913fe..90fc88bc 100644
--- a/gestion/iscsi/nolslib.py
+++ b/gestion/iscsi/nolslib.py
@@ -9,7 +9,8 @@
 '''Bibliothèque pour accéder à la baie de stockage nols, récupère les données
 formatées en XML'''
 
-import telnetlib, re
+import telnetlib
+import re
 from xml.etree.ElementTree import ElementTree, fromstring
 
 # Message envoyé par le serveur pour attendre l'appuie sur touche
diff --git a/surveillance/mac_prises/mac_prise_analyzer.py b/surveillance/mac_prises/mac_prise_analyzer.py
index e6907e2f..99f8a15f 100755
--- a/surveillance/mac_prises/mac_prise_analyzer.py
+++ b/surveillance/mac_prises/mac_prise_analyzer.py
@@ -137,7 +137,7 @@ Subject: %(subject)s
 Content-Type: multipart/mixed; boundary="_424234545aaff-ffca234efff-556adceff5646_"
 
 --_424234545aaff-ffca234efff-556adceff5646_
-Content-Type: text/plain, charset="UTF-8"
+Content-Type: text/plain; charset="UTF-8"
 
 %(contenu)s
 
diff --git a/surveillance/mac_prises/mac_prise_reperage.py b/surveillance/mac_prises/mac_prise_reperage.py
index 672a82ba..7b6cbd95 100755
--- a/surveillance/mac_prises/mac_prise_reperage.py
+++ b/surveillance/mac_prises/mac_prise_reperage.py
@@ -98,7 +98,7 @@ if __name__ == '__main__':
     message = """From: %(from)s
 To: %(to)s
 Subject: %(subject)s
-Content-Type: text/plain, charset="UTF-8"
+Content-Type: text/plain; charset="UTF-8"
 
 %(contenu)s