diff options
Diffstat (limited to 'src/stroke/stroke_keywords.h')
| -rw-r--r-- | src/stroke/stroke_keywords.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/stroke/stroke_keywords.h b/src/stroke/stroke_keywords.h index 4a3826536..76f6c1be3 100644 --- a/src/stroke/stroke_keywords.h +++ b/src/stroke/stroke_keywords.h @@ -25,6 +25,10 @@ typedef enum { STROKE_UP, STROKE_DOWN, STROKE_DOWN_SRCIP, +<<<<<<< HEAD +======= + STROKE_REKEY, +>>>>>>> upstream/4.5.1 STROKE_LOGLEVEL, STROKE_STATUS, STROKE_STATUSALL, @@ -48,6 +52,11 @@ typedef enum { STROKE_REREAD_CRLS, STROKE_REREAD_ALL, STROKE_PURGE_OCSP, +<<<<<<< HEAD +======= + STROKE_PURGE_CRLS, + STROKE_PURGE_CERTS, +>>>>>>> upstream/4.5.1 STROKE_PURGE_IKE, STROKE_EXPORT_X509, STROKE_LEASES, |