--- smeserver-tw-logonscript-1.3/root/home/e-smith/files/samba/netlogon/logon_script.pathDBSettings	2010-01-27 15:40:26.000000000 +1300
+++ smeserver-tw-logonscript-1.3/root/home/e-smith/files/samba/netlogon/logon_script	2010-01-27 15:43:02.000000000 +1300
@@ -38,15 +38,16 @@
     }
 
 # create drive mapping files for users
-
+    my $logonscriptdb = $db->get("tw-logonscript");
+    my $mount_point_path = $logonscriptdb->prop("MountPointsPath");
+    my $user_home_mount_point_name = $logonscriptdb->prop("UserHomeMountPointName");
     open LOGON, ">$netlogon_root/users/$username.bat";
     mkdir "$netlogon_root/users/$username";
     open PAMCONF, ">$netlogon_root/users/$username/.pam_mount.conf.xml";
     print PAMCONF "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n";
     print PAMCONF "<!DOCTYPE pam_mount SYSTEM \"pam_mount.conf.xml.dtd\">\n";
     print PAMCONF "<pam_mount>\n";
-    print PAMCONF "<volume user=\"*\" fstype=\"cifs\" server=\"$server_name\" path=\"%(DOMAIN_USER)\" mountpoint=\"~/win_home\" options=\"nodev,nosuid\"></volume>\n";
-
+    print PAMCONF "<volume user=\"*\" fstype=\"cifs\" server=\"$server_name\" path=\"%(DOMAIN_USER)\" mountpoint=\"$mount_point_path/$user_home_mount_point_name\" options=\"nodev,nosuid\"></volume>\n";
 
     foreach my $ibay ($adb->ibays)
     {
@@ -57,8 +58,7 @@
         if ($ibay_drive_letter ne "NONE") {
                 if (grep(/^$ibay_group$/,@groups) || ($ibay_useraccess eq "wr-group-rd-everyone")){
                         print LOGON "NET USE $ibay_drive_letter: \\\\$server_name\\".$ibay_name."\r\n";
-                        print PAMCONF "<volume user=\"*\" fstype=\"cifs\" server=\"$server_name\" path=\"$ibay_name\" mountpoint=\"~/$ibay_name\" options=\"nodev,nosuid\"></volume>\n";
-
+                        print PAMCONF "<volume user=\"*\" fstype=\"cifs\" server=\"$server_name\" path=\"$ibay_name\" mountpoint=\"$mount_point_path/$ibay_name\" options=\"nodev,nosuid\"></volume>\n";
             }
         }
     }