From 87d971ac7ead2a5613b247fd4325bb84977f2f3c Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Tue, 22 Sep 2015 20:27:33 +0200
Subject: [PATCH] =?UTF-8?q?Nouveau=20modules=20unifi=C3=A9=20et=20lien=20v?=
 =?UTF-8?q?ers=20le=20sites=20unifi=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 freeradius/modules/rlm_python_fil.conf     | 1 -
 freeradius/modules/rlm_python_nas.conf     | 1 -
 freeradius/modules/rlm_python_unifie.conf  | 1 +
 freeradius/modules/rlm_python_wifi.conf    | 1 -
 freeradius/sites-available/dynamic_clients | 2 +-
 freeradius/sites-available/filaire         | 6 +++---
 freeradius/sites-available/inner-tunnel    | 4 ++--
 7 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 120000 freeradius/modules/rlm_python_fil.conf
 delete mode 120000 freeradius/modules/rlm_python_nas.conf
 create mode 120000 freeradius/modules/rlm_python_unifie.conf
 delete mode 120000 freeradius/modules/rlm_python_wifi.conf

diff --git a/freeradius/modules/rlm_python_fil.conf b/freeradius/modules/rlm_python_fil.conf
deleted file mode 120000
index d7ab455d..00000000
--- a/freeradius/modules/rlm_python_fil.conf
+++ /dev/null
@@ -1 +0,0 @@
-../rlm_python_fil.conf
\ No newline at end of file
diff --git a/freeradius/modules/rlm_python_nas.conf b/freeradius/modules/rlm_python_nas.conf
deleted file mode 120000
index 09150afc..00000000
--- a/freeradius/modules/rlm_python_nas.conf
+++ /dev/null
@@ -1 +0,0 @@
-../rlm_python_nas.conf
\ No newline at end of file
diff --git a/freeradius/modules/rlm_python_unifie.conf b/freeradius/modules/rlm_python_unifie.conf
new file mode 120000
index 00000000..b3ac3bfa
--- /dev/null
+++ b/freeradius/modules/rlm_python_unifie.conf
@@ -0,0 +1 @@
+../rlm_python_unifie.conf
\ No newline at end of file
diff --git a/freeradius/modules/rlm_python_wifi.conf b/freeradius/modules/rlm_python_wifi.conf
deleted file mode 120000
index 30280afe..00000000
--- a/freeradius/modules/rlm_python_wifi.conf
+++ /dev/null
@@ -1 +0,0 @@
-../rlm_python_wifi.conf
\ No newline at end of file
diff --git a/freeradius/sites-available/dynamic_clients b/freeradius/sites-available/dynamic_clients
index 0da239a4..9ec7eadd 100644
--- a/freeradius/sites-available/dynamic_clients
+++ b/freeradius/sites-available/dynamic_clients
@@ -11,7 +11,7 @@ server dynamic_clients {
     update request {
       NAS-Identifier = "%{Packet-Src-IP-Address:-%{Packet-Src-IPv6-Address}}"
     }
-    crans_nas
+    crans_unifie
   }
 }
 
diff --git a/freeradius/sites-available/filaire b/freeradius/sites-available/filaire
index e9978d89..4a4dc6a3 100644
--- a/freeradius/sites-available/filaire
+++ b/freeradius/sites-available/filaire
@@ -7,14 +7,14 @@
 server filaire {
   authorize{
     preprocess
-    crans_fil
+    crans_unifie
   }
 
   authenticate{
-      crans_fil
+      crans_unifie
   }
 
   post-auth{
-      crans_fil
+      crans_unifie
   }
 }
diff --git a/freeradius/sites-available/inner-tunnel b/freeradius/sites-available/inner-tunnel
index 9378e132..9efa0f96 100644
--- a/freeradius/sites-available/inner-tunnel
+++ b/freeradius/sites-available/inner-tunnel
@@ -21,7 +21,7 @@ server inner-tunnel {
 authorize {
 	#preprocess
 
-	crans_wifi
+	crans_unifie
 	#
 	#  The chap module will set 'Auth-Type := CHAP' if we are
 	#  handling a CHAP request and Auth-Type has not already been set
@@ -237,7 +237,7 @@ session {
 #  Once we KNOW that the user has been authenticated, there are
 #  additional steps we can take.
 post-auth {
-	crans_wifi
+	crans_unifie
 
 	# Note that we do NOT assign IP addresses here.
 	# If you try to assign IP addresses for EAP authentication types,