Attachment 148412 Details for Bug 229343 – ifup-ipsec and doc patch

ifup-ipsec and doc patch

ipsec-patch (text/plain), 1.92 KB, created by Chris Adams on 2007-02-20 14:41:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Adams

Created: 2007-02-20 14:41:56 UTC

Size: 1.92 KB

patch

obsolete

>diff -urN initscripts-8.48-dist/sysconfig/network-scripts/ifup-ipsec initscripts-8.48/sysconfig/network-scripts/ifup-ipsec
>--- initscripts-8.48-dist/sysconfig/network-scripts/ifup-ipsec	2006-11-14 19:37:02.000000000 -0600
>+++ initscripts-8.48/sysconfig/network-scripts/ifup-ipsec	2007-02-20 08:34:22.000000000 -0600
>@@ -160,9 +160,19 @@
> 
> if [ "$KEYING" = "automatic" -a -n "$IKE_METHOD" ]; then
>     if [ "$IKE_METHOD" = "PSK" ]; then
>+       MYID=address
>+       KEYSTRING="$DST"
>+       if [ -n "$MYID_TYPE" ]; then
>+          case "$MYID_TYPE" in
>+             *fqdn*)
>+                 MYID="$MYID_TYPE \"$MYID_VALUE\""
>+		 KEYSTRING="$MYID_VALUE"
>+             ;;
>+          esac
>+       fi
>        tmpfile=`mktemp /etc/racoon/psk.XXXXXX`
>-       grep -v "^$DST" /etc/racoon/psk.txt > $tmpfile
>-       echo "$DST  $IKE_PSK" >> $tmpfile
>+       grep -v "^$KEYSTRING" /etc/racoon/psk.txt > $tmpfile
>+       echo "$KEYSTRING  $IKE_PSK" >> $tmpfile
>        mv -f $tmpfile /etc/racoon/psk.txt
>     fi
>     if [ ! -f /etc/racoon/$DST.conf -o /etc/racoon/$DST.conf -ot $1 ] ; then
>@@ -174,7 +184,7 @@
>         case "$IKE_METHOD" in
>            PSK)
> 	      cat >> /etc/racoon/$DST.conf << EOF
>-	my_identifier address;
>+	my_identifier $MYID;
> 	proposal {
> 	        encryption_algorithm $ESP_PROTO;
> 		hash_algorithm $AH_PROTO;
>diff -urN initscripts-8.48-dist/sysconfig.txt initscripts-8.48/sysconfig.txt
>--- initscripts-8.48-dist/sysconfig.txt	2006-11-14 19:37:02.000000000 -0600
>+++ initscripts-8.48/sysconfig.txt	2007-02-20 08:36:09.000000000 -0600
>@@ -868,6 +868,11 @@
>      one IPSEC configuration with the same DST), set KEYING=automatic and leave
>      all IKE_* parameters unspecified.
> 
>+     To override the identifier to use with a preshared key:
>+
>+       MYID_TYPE=address|fqdn|user_fqdn
>+       MYID_VALUE=fqdn or user_fqdn for this connection
>+
>    Usage of AH or ESP may be disabled by setting {AH,ESP}_PROTO to "none".
> 
>   Bonding-specific items

Actions: View

Attachments on bug 229343: 148412 | 148424