diff -ruN smeserver-libreswan-xl2tpd-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/20defaultL2tpd smeserver-libreswan-xl2tpd-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/20defaultL2tpd
--- smeserver-libreswan-xl2tpd-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/20defaultL2tpd	2018-06-21 14:58:05.684361226 +0200
+++ smeserver-libreswan-xl2tpd-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.conf/20defaultL2tpd	2018-06-21 15:00:19.874978246 +0200
@@ -37,7 +37,7 @@
         $OUT .= "    keyingtries=3\n";
         $OUT .= "    rekey=no\n";
         $OUT .= "    type=transport\n";
-        $OUT .= "    forceencaps=yes\n";
+        $OUT .= "    encapsulation=yes\n";
         $OUT .= "    right=%any\n";
         $OUT .= "    rightprotoport=17/%any\n";
         $OUT .= "    # Using the magic port of \"0\" means \"any one single port\". This is\n";
@@ -57,25 +57,26 @@
         my $dpdaction = $ipsecDB->get_prop( $ipsecprop, 'dpdaction' ) || "clear\n";
         $OUT .= "    dpdaction=$dpdaction\n";
 
-       # Some additional config entries if required
-       # For nat connections you can use "vhost:%no,%priv"
-       # Disabled for now - needs some thought
-
-       my $rightsubnet = $ipsecDB->get_prop( $ipsecprop, 'rightsubnet' ) || '';
-       if ($rightsubnet ne '') {
-       $OUT .= "    rightsubnet=$rightsubnet\n";
-       }
-
-       my $leftsourceip = $ipsecDB->get_prop( $ipsecprop, 'leftsourceip' ) || '';
-       if ($leftsourceip ne '') {
-       $OUT .= "    leftsourceip=$leftsourceip\n";
-       }
-
-       my $leftsubnet = $ipsecDB->get_prop( $ipsecprop, 'leftsubnet' ) || '';
-       if ($leftsubnet ne '') {
-       $OUT .= "    leftsubnet=$leftsubnet\n";
-       }
+        # Some additional config entries if required
+        # For nat connections you can use "vhost:%no,%priv"
+        # Disabled for now - needs some thought
+        # Probably only needed if you are doing subnet <-> subnet
+        # Most likely not required for dialin
+
+        my $rightsubnet = $ipsecDB->get_prop( $ipsecprop, 'rightsubnet' ) || '';
+        if ( $rightsubnet ne '' ) {
+            $OUT .= "    rightsubnet=$rightsubnet\n";
+        }
+
+        my $leftsourceip = $ipsecDB->get_prop( $ipsecprop, 'leftsourceip' ) || '';
+        if ( $leftsourceip ne '' ) {
+            $OUT .= "    leftsourceip=$leftsourceip\n";
+        }
+
+        my $leftsubnet = $ipsecDB->get_prop( $ipsecprop, 'leftsubnet' ) || '';
+        if ( $leftsubnet ne '' ) {
+            $OUT .= "    leftsubnet=$leftsubnet\n";
+        }
 
-        
     }
 }