diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2011-10-20 18:43:35 +0200 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2011-10-20 18:43:35 +0200 |
| commit | f53ffd2bf326a3f38681af654d4e804238614ca7 (patch) | |
| tree | f48f3266e96215d1028f35151499a53703e1d8d0 /common/conflex.c | |
| parent | 3f2aa5b0dfa2e72930bf8d62da445e36d3cfcd3a (diff) | |
| parent | 87d654840a8e3708d6540037fe95359c073ed021 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'common/conflex.c')
| -rw-r--r-- | common/conflex.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/conflex.c b/common/conflex.c index 1ec2328..9c9ed66 100644 --- a/common/conflex.c +++ b/common/conflex.c @@ -1228,6 +1228,8 @@ intern(char *atom, enum dhcp_token dfv) { return PEER; if (!strcasecmp (atom + 1, "rimary")) return PRIMARY; + if (!strcasecmp (atom + 1, "rimary6")) + return PRIMARY6; if (!strncasecmp (atom + 1, "artner", 6)) { if (!atom [7]) return PARTNER; @@ -1317,7 +1319,9 @@ intern(char *atom, enum dhcp_token dfv) { tolower((unsigned char)atom[2]) == 'c') { if (!strncasecmp(atom + 3, "ond", 3)) { if (!strcasecmp(atom + 6, "ary")) - return SECONDARY; + return SECONDARY; + if (!strcasecmp(atom + 6, "ary6")) + return SECONDARY6; if (!strcasecmp(atom + 6, "s")) return SECONDS; break; |