mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-03 07:45:20 +00:00
Code Issues Releases Wiki Activity

[master] Fix some cut and paste type errors in LDAP code

Browse Source 
Squashed commit of the following:

    [rt42666] Fix some cut and paste type errors in LDAP code

    Add the character '6' to some strings.  They were cut and pasted
    from the v4 versions and didn't get fully updated.
This commit is contained in:
Shawn Routhier
2016-06-20 07:39:32 -07:00
parent 09dccd0331
commit eb2d84b68e
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RELNOTES
View File

@@ -77,6 +77,11 @@ by Eric Young (eay@cryptsoft.com).
the client hostname from the original client. the client hostname from the original client.
[ISC-Bugs #42008] [ISC-Bugs #42008]
- In the LDAP code and schema add some missing '6' characters to use
the v6 instead of the v4 versions. Thanks to Denis Taranushin for
reporting this issue and supplying its patch.
[ISC-Bugs #42666]
Changes since 4.3.4b1 Changes since 4.3.4b1
- None - None

2
contrib/ldap/dhcp.schema
View File

@@ -484,5 +484,5 @@ objectclass ( 2.16.840.1.113719.1.203.6.18
SUP top SUP top
MUST ( cn $ dhcpRange6 ) MUST ( cn $ dhcpRange6 )
MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption ) MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption )
X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') ) X-NDS_CONTAINMENT ('dhcpSubnet6' 'dhcpSharedNetwork') )

8
server/ldap.c
View File

@@ -3,7 +3,7 @@
Routines for reading the configuration from LDAP */ Routines for reading the configuration from LDAP */
/* /*
* Copyright (c) 2010,2015 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2010,2015-2016 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2003-2006 Ntelos, Inc. * Copyright (c) 2003-2006 Ntelos, Inc.
* All rights reserved. * All rights reserved.
* *
@@ -638,7 +638,7 @@ ldap_parse_subnet6 (struct ldap_config_stack *item, struct parse *cfile)
ldap_value_free_len (tempbv); ldap_value_free_len (tempbv);
if ((tempbv = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL) if ((tempbv = ldap_get_values_len (ld, item->ldent, "dhcpRange6")) != NULL)
{ {
for (i=0; tempbv[i] != NULL; i++) for (i=0; tempbv[i] != NULL; i++)
{ {
@@ -702,9 +702,9 @@ ldap_parse_pool6 (struct ldap_config_stack *item, struct parse *cfile)
struct berval **tempbv; struct berval **tempbv;
int i; int i;
x_parser_strcat (cfile, "pool {\n"); x_parser_strcat (cfile, "pool6 {\n");
if ((tempbv = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL) if ((tempbv = ldap_get_values_len (ld, item->ldent, "dhcpRange6")) != NULL)
{ {
x_parser_strcat (cfile, "range6"); x_parser_strcat (cfile, "range6");
for (i=0; tempbv[i] != NULL; i++) for (i=0; tempbv[i] != NULL; i++)