diff options
Diffstat (limited to 'src/stroke/stroke_keywords.txt')
| -rw-r--r-- | src/stroke/stroke_keywords.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/stroke/stroke_keywords.txt b/src/stroke/stroke_keywords.txt index 0b8092985..fcc2ba558 100644 --- a/src/stroke/stroke_keywords.txt +++ b/src/stroke/stroke_keywords.txt @@ -32,6 +32,10 @@ unroute, STROKE_UNROUTE up, STROKE_UP down, STROKE_DOWN down-srcip, STROKE_DOWN_SRCIP +<<<<<<< HEAD +======= +rekey, STROKE_REKEY +>>>>>>> upstream/4.5.1 loglevel, STROKE_LOGLEVEL status, STROKE_STATUS statusall, STROKE_STATUSALL @@ -55,6 +59,11 @@ rereadacerts, STROKE_REREAD_ACERTS rereadcrls, STROKE_REREAD_CRLS rereadall, STROKE_REREAD_ALL purgeocsp, STROKE_PURGE_OCSP +<<<<<<< HEAD +======= +purgecrls, STROKE_PURGE_CRLS +purgecerts, STROKE_PURGE_CERTS +>>>>>>> upstream/4.5.1 purgeike, STROKE_PURGE_IKE exportx509, STROKE_EXPORT_X509 leases, STROKE_LEASES |