67 lines
2.5 KiB
Plaintext
67 lines
2.5 KiB
Plaintext
--- includes/dhcpd.h
|
|
+++ includes/dhcpd.h 2007/01/24 12:44:24
|
|
@@ -461,7 +461,7 @@
|
|
# define SV_LDAP_BASE_DN 51
|
|
# define SV_LDAP_METHOD 52
|
|
# define SV_LDAP_DEBUG_FILE 53
|
|
-# define SV_LDAP_SERVER_CN 54
|
|
+# define SV_LDAP_DHCP_SERVER_CN 54
|
|
#endif
|
|
|
|
#if !defined (DEFAULT_DEFAULT_LEASE_TIME)
|
|
--- server/ldap.c
|
|
+++ server/ldap.c 2007/01/24 12:44:24
|
|
@@ -51,7 +51,7 @@
|
|
*ldap_username = NULL,
|
|
*ldap_password = NULL,
|
|
*ldap_base_dn = NULL,
|
|
- *ldap_server_cn = NULL,
|
|
+ *ldap_dhcp_server_cn = NULL,
|
|
*ldap_debug_file = NULL;
|
|
static int ldap_port = LDAP_PORT,
|
|
ldap_method = LDAP_METHOD_DYNAMIC,
|
|
@@ -553,8 +553,8 @@
|
|
options, &global_scope, root_group, (struct group *) NULL);
|
|
|
|
ldap_server = _do_lookup_dhcp_string_option (options, SV_LDAP_SERVER);
|
|
- ldap_server_cn = _do_lookup_dhcp_string_option (options,
|
|
- SV_LDAP_SERVER_CN);
|
|
+ ldap_dhcp_server_cn = _do_lookup_dhcp_string_option (options,
|
|
+ SV_LDAP_DHCP_SERVER_CN);
|
|
ldap_port = _do_lookup_dhcp_int_option (options, SV_LDAP_PORT);
|
|
ldap_base_dn = _do_lookup_dhcp_string_option (options, SV_LDAP_BASE_DN);
|
|
ldap_method = _do_lookup_dhcp_enum_option (options, SV_LDAP_METHOD);
|
|
@@ -1123,10 +1123,10 @@
|
|
return (res);
|
|
|
|
uname (&unme);
|
|
- if (ldap_server_cn != NULL)
|
|
+ if (ldap_dhcp_server_cn != NULL)
|
|
{
|
|
snprintf (hfilter, sizeof (hfilter),
|
|
- "(&(objectClass=dhcpServer)(cn=%s))", ldap_server_cn);
|
|
+ "(&(objectClass=dhcpServer)(cn=%s))", ldap_dhcp_server_cn);
|
|
}
|
|
else
|
|
{
|
|
@@ -1148,7 +1148,7 @@
|
|
hfilter, NULL, 0, &hostres)) != LDAP_SUCCESS)
|
|
{
|
|
log_error ("Cannot find host LDAP entry %s %s",
|
|
- ((ldap_server_cn == NULL)?(unme.nodename):(ldap_server_cn)), hfilter);
|
|
+ ((ldap_dhcp_server_cn == NULL)?(unme.nodename):(ldap_dhcp_server_cn)), hfilter);
|
|
if(NULL != hostres)
|
|
ldap_msgfree (hostres);
|
|
ldap_stop();
|
|
--- server/stables.c
|
|
+++ server/stables.c 2007/01/24 12:44:24
|
|
@@ -491,7 +491,7 @@
|
|
{ "ldap-base-dn", "t", &server_universe, 51 },
|
|
{ "ldap-method", "Nldap-methods.", &server_universe, 52 },
|
|
{ "ldap-debug-file", "t", &server_universe, 53 },
|
|
- { "ldap-server-cn", "t", &server_universe, 54 },
|
|
+ { "ldap-dhcp-server-cn", "t", &server_universe, 54 },
|
|
#else
|
|
{ "unknown-47", "X", &server_universe, 47 },
|
|
{ "unknown-48", "X", &server_universe, 48 },
|