diff options
Diffstat (limited to 'src/ipsec/ipsec.in')
| -rwxr-xr-x | src/ipsec/ipsec.in | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in index 0f619d087..2ea0ef798 100755 --- a/src/ipsec/ipsec.in +++ b/src/ipsec/ipsec.in @@ -65,11 +65,7 @@ case "$1" in echo " rereadsecrets|rereadgroups" echo " rereadcacerts|rereadaacerts|rereadocspcerts" echo " rereadacerts|rereadcrls|rereadall" -<<<<<<< HEAD - echo " purgeocsp|purgeike" -======= echo " purgeocsp|purgecrls|purgecerts|purgeike" ->>>>>>> upstream/4.5.1 echo " scencrypt|scdecrypt <value> [--inbase <base>] [--outbase <base>] [--keyid <id>]" echo " openac" echo " pluto" @@ -195,19 +191,11 @@ rereadall|purgeocsp) fi exit "$rc" ;; -<<<<<<< HEAD -purgeike) - rc=7 - if [ -e $IPSEC_CHARON_PID ] - then - $IPSEC_STROKE purgeike -======= purgeike|purgecrls|purgecerts) rc=7 if [ -e $IPSEC_CHARON_PID ] then $IPSEC_STROKE "$1" ->>>>>>> upstream/4.5.1 rc="$?" fi exit "$rc" |