smeserver-libreswan/contribs9/smeserver-libreswan-modify-identifiers.patch

diff -ruN smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords
--- smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords        2017-01-26 11:30:37.126000041 +0100
+++ smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords    2017-01-26 11:30:48.421000041 +0100
@@ -74,7 +74,7 @@
                             $OUT .= "$left %any \: PSK \"$passwd\"";
                         }
                         else {
-                            $OUT .= "\@$leftid \@$rightid \: PSK \"$passwd\"";
+                            $OUT .= "$leftid $rightid \: PSK \"$passwd\"";
                         }
                     }
 
@@ -83,12 +83,12 @@
                             $OUT .= "%any $right\: PSK \"$passwd\"";
                         }
                         else {
-                            $OUT .= "\@$rightid \@$leftid \: PSK \"$passwd\"";
+                            $OUT .= "$leftid $rightid \: PSK \"$passwd\"";
                         }
                     }
 
                     elsif ( ( $leftid ne '' ) && ( $rightid ne '' ) ) {
-                        $OUT .= "\@$rightid \@$leftid \: PSK \"$passwd\"";
+                        $OUT .= "$leftid $rightid \: PSK \"$passwd\"";
                     }
 
                     else {
1	diff -ruN smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords
2	--- smeserver-libreswan-0.5.old/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords 2017-01-26 11:30:37.126000041 +0100
3	+++ smeserver-libreswan-0.5/root/etc/e-smith/templates/etc/ipsec.d/ipsec.secrets/10Passwords 2017-01-26 11:30:48.421000041 +0100
4	@@ -74,7 +74,7 @@
5	$OUT .= "$left %any \: PSK \"$passwd\"";
6	}
7	else {
8	- $OUT .= "\@$leftid \@$rightid \: PSK \"$passwd\"";
9	+ $OUT .= "$leftid $rightid \: PSK \"$passwd\"";
10	}
11	}
12
13	@@ -83,12 +83,12 @@
14	$OUT .= "%any $right\: PSK \"$passwd\"";
15	}
16	else {
17	- $OUT .= "\@$rightid \@$leftid \: PSK \"$passwd\"";
18	+ $OUT .= "$leftid $rightid \: PSK \"$passwd\"";
19	}
20	}
21
22	elsif ( ( $leftid ne '' ) && ( $rightid ne '' ) ) {
23	- $OUT .= "\@$rightid \@$leftid \: PSK \"$passwd\"";
24	+ $OUT .= "$leftid $rightid \: PSK \"$passwd\"";
25	}
26
27	else {