diff -ruN e-smith-samba-2.2.0.old/createlinks e-smith-samba-2.2.0/createlinks
--- e-smith-samba-2.2.0.old/createlinks	2013-03-01 07:50:50.000000000 -0800
+++ e-smith-samba-2.2.0/createlinks	2013-03-17 20:43:34.000000000 -0700
@@ -23,7 +23,7 @@
 }
 
 foreach my $file (qw(
-	/etc/pam.d/samba
+	/etc/pam.d/samba /home/e-smith/files/server-resources/regedit/win7samba.reg
 	))
 {
     templates2events($file, qw(console-save bootstrap-console-save));
diff -ruN e-smith-samba-2.2.0.old/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/LanManWorkstation e-smith-samba-2.2.0/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/LanManWorkstation
--- e-smith-samba-2.2.0.old/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/LanManWorkstation	1969-12-31 16:00:00.000000000 -0800
+++ e-smith-samba-2.2.0/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/LanManWorkstation	2013-03-01 18:29:41.000000000 -0800
@@ -0,0 +1,3 @@
+[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\LanManWorkstation\Parameters]
+"DNSNameResolutionRequired"=dword:00000000
+"DomainCompatibilityMode"=dword:00000001
diff -ruN e-smith-samba-2.2.0.old/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/template-begin e-smith-samba-2.2.0/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/template-begin
--- e-smith-samba-2.2.0.old/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/template-begin	1969-12-31 16:00:00.000000000 -0800
+++ e-smith-samba-2.2.0/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/template-begin	2013-03-01 18:29:31.000000000 -0800
@@ -0,0 +1,2 @@
+Windows Registry Editor Version 5.00
+
diff -ruN e-smith-samba-2.2.0.old/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/WaitForNetwork e-smith-samba-2.2.0/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/WaitForNetwork
--- e-smith-samba-2.2.0.old/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/WaitForNetwork	1969-12-31 16:00:00.000000000 -0800
+++ e-smith-samba-2.2.0/root/etc/e-smith/templates/home/e-smith/files/server-resources/regedit/win7samba.reg/WaitForNetwork	2013-03-17 20:39:41.000000000 -0700
@@ -0,0 +1,13 @@
+{
+# $smb{'WaitForNetwork'} is not set by default, 'enabled' is also used to avoid 'WaitForNetwork'
+# 'disabled' sets "WaitForNetwork"=dword:00000000
+# Other values are possible, instance 60, sets "WaitForNetwork"=dword:00000060
+
+   if (defined $smb{'WaitForNetwork'} && $smb{'WaitForNetwork'} && ($smb{'WaitForNetwork'} ne "enabled"))
+   {
+      $OUT = "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\System]\n";
+      $OUT .= "\"WaitForNetwork\"=dword:";
+      if ($smb{'WaitForNetwork'} eq "disabled") {$smb{'WaitForNetwork'} = "00000000";}
+      $OUT .= $smb{'WaitForNetwork'};
+   } 
+}
diff -ruN e-smith-samba-2.2.0.old/root/home/e-smith/files/server-resources/regedit/win7samba.reg e-smith-samba-2.2.0/root/home/e-smith/files/server-resources/regedit/win7samba.reg
--- e-smith-samba-2.2.0.old/root/home/e-smith/files/server-resources/regedit/win7samba.reg	2013-03-01 07:50:50.000000000 -0800
+++ e-smith-samba-2.2.0/root/home/e-smith/files/server-resources/regedit/win7samba.reg	1969-12-31 16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-Windows Registry Editor Version 5.00
-
-[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\LanManWorkstation\Parameters]
-"DNSNameResolutionRequired"=dword:00000000
-"DomainCompatibilityMode"=dword:00000001