diff -Nur smeserver-openvpn-s2s-0.1/createlinks smeserver-openvpn-s2s-0.1_mod/createlinks
--- smeserver-openvpn-s2s-0.1/createlinks	2010-12-07 20:30:52.000000000 +0100
+++ smeserver-openvpn-s2s-0.1_mod/createlinks	2010-12-07 20:31:45.000000000 +0100
@@ -4,8 +4,6 @@
 
 safe_symlink("restart", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/openvpn-s2s");
 safe_symlink("adjust", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/masq");
-safe_symlink("restart", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/smbd");
-safe_symlink("restart", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/nmbd");
 
 service_link_enhanced("openvpn-s2s", "S80", "7");
 service_link_enhanced("openvpn-s2s", "K25", "6");
@@ -18,7 +16,6 @@
 
 templates2events("/etc/rc.d/init.d/masq", qw/openvpn-s2s-update/);
 templates2events("/etc/crontab", qw/openvpn-s2s-update/);
-templates2events("/etc/samba/smb.conf", qw/openvpn-s2s-update/);
 
 
 panel_link("openvpns2s", 'manager');
diff -Nur smeserver-openvpn-s2s-0.1/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn smeserver-openvpn-s2s-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn
--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn	2010-10-16 17:56:47.000000000 +0200
+++ smeserver-openvpn-s2s-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn	1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-{
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-}
-interfaces = 127.0.0.1 {
-    $OUT .= (defined $LocalIP ?
-        "$LocalIP/$LocalNetmask" :
-        "");
-    my $vpndb = esmith::ConfigDB->open_ro('openvpn-s2s') || die "Couldn't open openvpn-s2s DB\n";
-    my @vpns = ($vpndb->get_all_by_prop(type=>'client'), $vpndb->get_all_by_prop(type=>'server'));
-    foreach my $vpn (@vpns){
-       if ($vpn->prop('status') eq 'enabled'){
-           $OUT .= " " . $vpn->prop('LocalIP') . "/32";
-       }
-    }
-}
-