aboutsummaryrefslogtreecommitdiff
path: root/includes/dhctoken.h
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-04-16 13:25:36 +0200
committerBjørn Mork <bjorn@mork.no>2012-04-16 13:25:36 +0200
commitaaf12f3264d8fa96c65a18efad8161368200f8e3 (patch)
tree05a9c405af9f5c0e10b6ed6ebbb86ff5fbb8013f /includes/dhctoken.h
parent402b4a6e3f8c2f42fe326b0b90c5311d2edbb6f3 (diff)
parentaa161a719e968da4be1a97b2b7ccf312dafad3dc (diff)
Merge branch 'upstream'HEADmaster
Diffstat (limited to 'includes/dhctoken.h')
-rw-r--r--includes/dhctoken.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 9911d70..6815da4 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -3,7 +3,7 @@
Tokens for config file lexer and parser. */
/*
- * Copyright (c) 2004,2007-2011 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007-2012 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
@@ -363,7 +363,8 @@ enum dhcp_token {
INITIAL_DELAY = 664,
GETHOSTBYNAME = 665,
PRIMARY6 = 666,
- SECONDARY6 = 667
+ SECONDARY6 = 667,
+ TOKEN_INFINIBAND = 668
};
#define is_identifier(x) ((x) >= FIRST_TOKEN && \