diff options
Diffstat (limited to 'src/libstrongswan/enum.c')
| -rw-r--r-- | src/libstrongswan/enum.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstrongswan/enum.c b/src/libstrongswan/enum.c index 258a5b410..df6a73a81 100644 --- a/src/libstrongswan/enum.c +++ b/src/libstrongswan/enum.c @@ -43,7 +43,11 @@ int enum_from_name(enum_name_t *e, char *name) { do { +<<<<<<< HEAD int i, count = e->last - e->first; +======= + int i, count = e->last - e->first + 1; +>>>>>>> upstream/4.5.1 for (i = 0; i < count; i++) { |