From 170484e4f81622730b3a3b522ecb40fabd4f02e6 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 16 Jul 2012 16:28:41 +0200
Subject: [PATCH] Utilisation de LogonDrive au lieu de HomeDrive

---
 root/etc/e-smith/templates/etc/smb.conf/22MapHomeDir     |  2 --
 root/etc/e-smith/web/functions/logonscript               | 16 ++++++++--------
 .../site_perl/esmith/FormMagick/Panel/logonscript.pm     |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 root/etc/e-smith/templates/etc/smb.conf/22MapHomeDir

diff --git a/root/etc/e-smith/templates/etc/smb.conf/22MapHomeDir b/root/etc/e-smith/templates/etc/smb.conf/22MapHomeDir
deleted file mode 100644
index 77e109f..0000000
--- a/root/etc/e-smith/templates/etc/smb.conf/22MapHomeDir
+++ /dev/null
@@ -1,2 +0,0 @@
-logon drive = { $smb{'HomeDrive'} || 'h:' }
-
diff --git a/root/etc/e-smith/web/functions/logonscript b/root/etc/e-smith/web/functions/logonscript
index 5d0dff8..415172d 100644
--- a/root/etc/e-smith/web/functions/logonscript
+++ b/root/etc/e-smith/web/functions/logonscript
@@ -42,14 +42,14 @@ __DATA__
         <description>FIRSTPAGE_DESC</description>
         <field type="select"
             id="homedrive"
-            options="'a:' => 'A:', 'b:' => 'B:', 'c:' => 'C:', 'd:' => 'D:',
-                     'e:' => 'E:', 'f:' => 'F:', 'g:' => 'G:', 'h:' => 'H:',
-                     'i:' => 'I:', 'j:' => 'J:', 'k:' => 'K:', 'l:' => 'L:',
-                     'm:' => 'M:', 'n:' => 'N:', 'o:' => 'O:', 'p:' => 'P:',
-                     'q:' => 'Q:', 'r:' => 'R:', 's:' => 'S:', 't:' => 'T:',
-                     'u:' => 'U:', 'v:' => 'V:', 'w:' => 'W:', 'x:' => 'X:',
-                     'y:' => 'Y:', 'z:' => 'Z:'"
-            value="get_prop('smb', 'HomeDrive')">
+            options="'a' => 'A:', 'b' => 'B:', 'c' => 'C:', 'd' => 'D:',
+                     'e' => 'E:', 'f' => 'F:', 'g' => 'G:', 'h' => 'H:',
+                     'i' => 'I:', 'j' => 'J:', 'k' => 'K:', 'l' => 'L:',
+                     'm' => 'M:', 'n' => 'N:', 'o' => 'O:', 'p' => 'P:',
+                     'q' => 'Q:', 'r' => 'R:', 's' => 'S:', 't' => 'T:',
+                     'u' => 'U:', 'v' => 'V:', 'w' => 'W:', 'x' => 'X:',
+                     'y' => 'Y:', 'z' => 'Z:'"
+            value="get_prop('smb', 'LogonDrive')">
             <label>LABEL_HOME_DRIVE</label>
             <description>DESC_HOME_DRIVE</description>
         </field>
diff --git a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/logonscript.pm b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/logonscript.pm
index 545c63f..3d40a5d 100644
--- a/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/logonscript.pm
+++ b/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/logonscript.pm
@@ -61,7 +61,7 @@ sub save_change {
     }
     print LOGON $logon;
     close LOGON;
-    $c->set_prop('smb', 'HomeDrive', $drive);
+    $c->set_prop('smb', 'LogonDrive', $drive);
     unless ( system ("/sbin/e-smith/signal-event", "workgroup-update") == 0 ){
         return $self->error('ERROR_OCCURED');;
     }