diff options
| author | Ted Lemon <source@isc.org> | 2000-10-10 22:05:53 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2000-10-10 22:05:53 +0000 |
| commit | eebf58bc75e6218ebd2e2d61dc7239d78363ff03 (patch) | |
| tree | 8cb12cee7df580f6ef576aa53cb2e90eda08c000 | |
| parent | 52b2c640361a74fa9ff5dab97c38fcdb06cf40f7 (diff) | |
| download | isc-dhcp-eebf58bc75e6218ebd2e2d61dc7239d78363ff03.tar.gz | |
Add initializer arg to object type setup calls.
| -rw-r--r-- | common/comapi.c | 11 | ||||
| -rw-r--r-- | common/conflex.c | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/common/comapi.c b/common/comapi.c index 0375e0ba..ff95f1c2 100644 --- a/common/comapi.c +++ b/common/comapi.c @@ -50,7 +50,7 @@ #ifndef lint static char copyright[] = -"$Id: comapi.c,v 1.5 2000/08/08 18:07:16 neild Exp $ Copyright (c) 1999-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: comapi.c,v 1.6 2000/10/10 22:04:31 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -77,7 +77,7 @@ void dhcp_common_objects_setup () dhcp_group_lookup, dhcp_group_create, dhcp_group_remove, 0, 0, 0, - sizeof (struct group_object)); + sizeof (struct group_object), 0); if (status != ISC_R_SUCCESS) log_fatal ("Can't register group object type: %s", isc_result_totext (status)); @@ -92,7 +92,7 @@ void dhcp_common_objects_setup () dhcp_subnet_lookup, dhcp_subnet_create, dhcp_subnet_remove, 0, 0, 0, - sizeof (struct subnet)); + sizeof (struct subnet), 0); if (status != ISC_R_SUCCESS) log_fatal ("Can't register subnet object type: %s", isc_result_totext (status)); @@ -108,7 +108,7 @@ void dhcp_common_objects_setup () dhcp_shared_network_lookup, dhcp_shared_network_create, dhcp_shared_network_remove, 0, 0, 0, - sizeof (struct shared_network)); + sizeof (struct shared_network), 0); if (status != ISC_R_SUCCESS) log_fatal ("Can't register shared network object type: %s", isc_result_totext (status)); @@ -124,7 +124,8 @@ void dhcp_common_objects_setup () dhcp_interface_create, dhcp_interface_remove, 0, 0, 0, - sizeof (struct interface_info)); + sizeof (struct interface_info), + 0); if (status != ISC_R_SUCCESS) log_fatal ("Can't register interface object type: %s", isc_result_totext (status)); diff --git a/common/conflex.c b/common/conflex.c index 7eba98a9..5b307028 100644 --- a/common/conflex.c +++ b/common/conflex.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: conflex.c,v 1.81 2000/08/31 04:36:34 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: conflex.c,v 1.82 2000/10/10 22:05:53 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -647,6 +647,8 @@ static enum dhcp_token intern (atom, dfv) return ERROR; if (!strcasecmp (atom + 1, "val")) return EVAL; + if (!strcasecmp (atom + 1, "ncapsulate")) + return ENCAPSULATE; break; case 'f': if (!strcasecmp (atom + 1, "atal")) @@ -1000,6 +1002,8 @@ static enum dhcp_token intern (atom, dfv) case 'v': if (!strcasecmp (atom + 1, "endor-class")) return VENDOR_CLASS; + if (!strcasecmp (atom + 1, "endor")) + return VENDOR; break; case 'w': if (!strcasecmp (atom + 1, "ith")) |