SOURCES: dhcp-ldap.patch - synced with http://home.ntelos.net/~mas...
baggins
baggins at pld-linux.org
Tue Apr 17 16:00:23 CEST 2007
Author: baggins Date: Tue Apr 17 14:00:23 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- synced with http://home.ntelos.net/~masneyb/dhcp-3.0.5-ldap-patch
---- Files affected:
SOURCES:
dhcp-ldap.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/dhcp-ldap.patch
diff -u SOURCES/dhcp-ldap.patch:1.3 SOURCES/dhcp-ldap.patch:1.4
--- SOURCES/dhcp-ldap.patch:1.3 Mon Apr 16 19:38:07 2007
+++ SOURCES/dhcp-ldap.patch Tue Apr 17 16:00:17 2007
@@ -1,7 +1,176 @@
-diff -Naur dhcp-3.0.1rc14/Changelog-LDAP dhcp-3.0.1rc14-ldap/Changelog-LDAP
---- dhcp-3.0.1rc14/Changelog-LDAP 1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-3.0.1rc14-ldap/Changelog-LDAP 2004-06-22 15:18:20.000000000 -0400
-@@ -0,0 +1,82 @@
+diff -Naur dhcp-3.0.5/Changelog-LDAP dhcp-3.0.5-ldap/Changelog-LDAP
+--- dhcp-3.0.5/Changelog-LDAP 1969-12-31 19:00:00.000000000 -0500
++++ dhcp-3.0.5-ldap/Changelog-LDAP 2007-02-23 14:06:33.000000000 -0500
+@@ -0,0 +1,251 @@
++2007-2-23 Brian Masney <masneyb at ntelos.net>
++ * contrib/dhcpd-conf-to-ldap.pl - fixed a parsing bug in which
++ didn't handle correctly quoted string containing spaces.
++ (Rapha?l Luta <raphael.luta at aptiwan.com>)
++
++ * dst/Makefile.dist server/Makefile.dist site.conf - updated build
++ method when using -lssl.
++ (from Marius Tomaschewski <mt at suse.de>)
++
++ * server/ldap.c - fix for ldap_read_function to avoid returning
++ empty strings (skipped host declaration from ldap) that are causing
++ parsing errors in ldap-dynamic mode.
++ (from Marius Tomaschewski <mt at suse.de>)
++
++ * includes/dhcpd.h README.ldap server/dhcpd.c server/ldap.c
++ server/stables.c - added ldap-ssl <off|start_tls|ldaps|on> option and
++ several ldap-tls* options, that are described in the "man ldap.conf".
++ (from Marius Tomaschewski <mt at suse.de>)
++
++ * includes/dhcpd.h server/ldap.c server/stables.c - added ldap-referrals
++ <on|off> option. Also implemented a LDAP rebuind function
++ (from Kalyan <skalyanasundaram at novell.com>)
++
++ * includes/dhcpd.h server/ldap.c server/stables.c - renamed dhcpd.conf
++ option ldap-server-cn to ldap-dhcp-server-cn
++ (from Marius Tomaschewski <mt at suse.de>)
++
++ * contrib/dhcp.schema - schema updates
++ (from Kalyan <skalyanasundaram at novell.com>)
++
++ * server/ldap.c server/ldap_casa.c - CASA support fixes
++ (from Marius Tomaschewski <mt at suse.de>)
++
++ * server/ldap.c - added strncat() fix
++ (from Marius Tomaschewski <mt at suse.de>)
++
++2006-12-15 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_read_config) - unbind from the LDAP server after
++ the config file has been ran if the server is being ran in static mode
++ (from Tomas Hoger <thoger at pobox.sk>)
++
++ * server/ldap.c (ldap_read_function) - fixed bug where the entire
++ configuration was not being processed in the LDAP directory.
++
++ * server/ldap.c - added the following functions for reading values
++ from the config file: _do_lookup_dhcp_string_option(),
++ _do_lookup_dhcp_int_option() and _do_lookup_dhcp_enum_option(). This
++ helped to clean up ldap_start() start a bit. Also, various small
++ formatting changes to the code.
++
++2006-12-15 Marius Tomaschewski <mt at suse.de>
++ * Changelog-LDAP - Added / changed some of entries in
++ Changelog-LDAP, e.g. changes to the dhcpServer and
++ dhcpService objectclasses in schema file was not mentioned.
++
++ * server/ldap.c Some a little bit paranoid checks to strchr results
++ in the group patch, avoided allocation of groupname using snprintf
++ with a "%.*s" format.
++
++ * server/ldap.c - Readded FIXME comment about one space in
++ dhcpHWAddress.
++
++ * server/ldap.c Changed "dhcpdnsZone" and "dhcpdnszoneServer" into
++ "dhcpDnsZone" and "dhcpDnsZoneServer".
++
++ * Fixed memory leak in ldap_parse_zone (dfree of keyCn), added checks
++ for dmalloc and strchr results.
++
++ * ldap_casa.c, ldap_casa.h - surrounded content of ldap_casa.h and
++ ldap_casa.c with if defined(LDAP_CASA_AUTH).
++
++ * contrib/dhcp.schema - Reverted the equality change for dhcpOption.
++ The dhcp options are case-insensitive in dhcpd.conf.
++
++ * Changed "dhcpdnsZone" and "dhcpdnszoneServer" into "dhcpDnsZone"
++ and "dhcpDnsZoneServer".
++
++ * Changed "FQDNs" into "DNs" in dhcpLocatorDN description (DN is already
++ absolute, RDN is relative DN, FQDN means a full qualified domain name).
++
++2006-12-15 Kalyan <skalyanasundaram at novell.com>
++ * includes/ldap_casa.h server/ldap_casa.c - updated to support CASA
++ 1.7
++
++2006-8-15 Kalyan <skalyanasundaram at novell.com>
++ * server/ldap.c (ldap_parse_options) - fetch option from the group
++ if the host belongs to that group in the dynamic method.
++
++ * contrib/dhcp.schema - modified dhcpServiceDN attribute in dhcpServer
++ objectclasses to be optional instead of mandatory
++
++ * contrib/dhcp.schema - modified dhcpPrimaryDN attribute in dhcpService
++ objectclasses to be optional instead of mandatory
++
++ * contrib/dhcp.schema - schema has been updated with
++ new objectclasses dhcpLocator,dhcpTsigKey,dhcpdnsZone,dhcpFailOver and
++ many attributes.
++
++ * contrib/dhcp.schema - dhcpHWAddress's equality has been modified to
++ caseIgnoreIA5Match.
++
++ * server/ldap.c - added support for reading the dhcpTsigKey and
++ dhcpdnsZone objects.
++
++ * server/ldap.c (ldap_parse_options) Fetch option from the group if
++ the host belongs to that group in the dynamic method.
++
++ * server/ldap.c - CASA authentication is enabled.
++
++ * server/ldap.c - introduced new attribute ldap-server-cn to mention
++ the dhcpServer object name in configuration.
++
++2006-7-17 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_read_function) - fixes for reading the data
++ from the LDAP tree in some cases (patch from
++ Darrin Smith <beldin at beldin.org>)
++
++2006-3-17 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_read_function) - added patch from
++ Dmitriy Bogun <kabanyura at gmail.com>. This patch fixes a bug when
++ EOF wasn't returned in some cases.
++
++2005-9-26 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_start) - added support for reading the
++ ldap-port option. This option was not being used.
++
++2005-5-24 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_parse_host) - allow dhcpHost entries that do
++ not have a hardware address associated with them
++
++2005-4-11 Brian Masney <masneyb at ntelos.net>
++ * README.ldap - updated directions on how to use LDAP over SSL on
++ non-Linux machines
++
++2005-2-23 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_generate_config_string) - do a case insensitive
++ string comparsion when comparing the object classes
++
++2004-11-8 Brian Masney <masneyb at ntelos.net>
++ * debian/control - updated the depends and build-depends line
++ (from Andrew Pollock <me at andrew.net.au>)
++
++2004-10-13 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c (ldap_start) - allow doing an anonymous bind to the
++ LDAP server
++
++2004-9-27 Brian Masney <masneyb at ntelos.net>
++ * contrib/dhcpd-conf-to-ldap.pl - make sure the DHCP hardware address
++ is always lowercased
++
++2004-7-30 Brian Masney <masneyb at ntelos.net>
++ * server/ldap.c - added more debbuging statements. Fixed possible crash
++ that could occur whenever more than 1 external DN is added to an LDAP
++ entry. Fixed possible infinite loop when reading the external DNs.
++ (from Sebastian Hetze <s.hetze at linux-ag.de>)
++
++2004-7-1 Brian Masney <masneyb at ntelos.net>
++ * README.ldap - updated build instructions paragraph
++ (from Mason Schmitt <sysadmin at sunwave.net>)
++
++2004-6-29 Brian Masney <masneyb at ntelos.net>
++ * debian/control - set the minimum required version of the DHCP server
++ to be 3.0.1rc9
++
++ * configure - fix for sed when configure was run from an older shell
++
++2004-6-22 Brian Masney <masneyb at ntelos.net>
++ * Updated patch to use ISC DHCP 3.0.1rc14
++
+2004-5-24 Brian Masney <masneyb at ntelos.net>
+ * server/ldap.c - don't append a ; to the end of a dhcpStatement if it
+ ends in }
@@ -84,10 +253,10 @@
+2003-9-11 Brian Masney <masneyb at ntelos.net>
+ * updated patch to work with 3.0.1rc12
+
-diff -Naur dhcp-3.0.1rc14/README.ldap dhcp-3.0.1rc14-ldap/README.ldap
---- dhcp-3.0.1rc14/README.ldap 1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-3.0.1rc14-ldap/README.ldap 2004-06-22 15:18:20.000000000 -0400
-@@ -0,0 +1,166 @@
+diff -Naur dhcp-3.0.5/README.ldap dhcp-3.0.5-ldap/README.ldap
+--- dhcp-3.0.5/README.ldap 1969-12-31 19:00:00.000000000 -0500
++++ dhcp-3.0.5-ldap/README.ldap 2007-02-23 13:13:36.000000000 -0500
+@@ -0,0 +1,190 @@
+LDAP Support in DHCP
+Brian Masney <masneyb at ntelos.net>
+Last updated 3/23/2003
@@ -129,13 +298,20 @@
+dhcpSubnet. If you do not see these, you need to check over your LDAP
+configuration before you go any further.
+
-+You should be ready to build DHCP. Edit the includes/site.h file and uncomment
-+the #define LDAP_CONFIGURATION. If you would like to enable LDAP over SSL,
-+uncomment the USE_SSL line as well. Now run configure in the base source
-+directory. Edit the work.os/server/Makefile and add -lldap to the LIBS= line.
-+(replace os with your operating system, linux-2.2 on my machine). If you
-+enabled SSL, you will also need to add -lcrypto -lssl. You should now be able
-+to type make to build your DHCP server.
++You should now be ready to build DHCP. If you would like to enable LDAP over
++SSL, you will need to perform the following steps:
++
++ * Edit the includes/site.h file and uncomment the USE_SSL line
++ or specify "-DUSE_SSL" via CFLAGS.
++ * Edit the dst/Makefile.dist file and remove md5_dgst.c and md5_dgst.o
++ from the SRC= and OBJ= lines (around line 24)
++ * Now run configure in the base source directory. If you chose to enable
++ LDAP over SSL, you must append -lcrypto -lssl to the LIBS= line in the file
++ work.os/server/Makefile (replace os with your operating system, linux-2.2 on
++ my machine). You should now be able to type make to build your DHCP server.
++
++If you choose to not enable LDAP over SSL, then you only need to run configure
++and make in the toplevel source directory.
+
+Once you have DHCP installed, you will need to setup your initial plaintext
+config file. In my /etc/dhcpd.conf file, I have:
@@ -148,6 +324,23 @@
+ldap-method dynamic;
+ldap-debug-file "/var/log/dhcp-ldap-startup.log";
+
++If SSL has been enabled at compile time using the USE_SSL flag, the dhcp
++server trys to use TLS if possible, but continues without TLS if not.
++
++You can modify this behaviour using following option in /etc/dhcpd.conf:
++
++ldap-ssl <off | ldaps | start_tls | on>
++ off: disables TLS/LDAPS.
++ ldaps: enables LDAPS -- don't forget to set ldap-port to 636.
++ start_tls: enables TLS using START_TLS command
++ on: enables LDAPS if ldap-port is set to 636 or TLS in
++ other cases.
++
++See also "man 5 ldap.conf" for description the following TLS related
++options:
++ ldap-tls-reqcert, ldap-tls-ca-file, ldap-tls-ca-dir, ldap-tls-cert
++ ldap-tls-key, ldap-tls-crlcheck, ldap-tls-ciphers, ldap-tls-randfile
++
+All of these parameters should be self explanatory except for the ldap-method.
+You can set this to static or dynamic. If you set it to static, the
+configuration is read once on startup, and LDAP isn't used anymore. But, if you
@@ -254,14 +447,14 @@
+add the line: COPTS= -DDEBUG_LDAP and recompile DHCP. (make sure you run make
+clean and rerun configure before you rebuild).
+
-diff -Naur dhcp-3.0.1rc14/common/conflex.c dhcp-3.0.1rc14-ldap/common/conflex.c
---- dhcp-3.0.1rc14/common/conflex.c 2004-06-10 13:59:14.000000000 -0400
-+++ dhcp-3.0.1rc14-ldap/common/conflex.c 2004-06-22 15:18:20.000000000 -0400
+diff -Naur dhcp-3.0.5/common/conflex.c dhcp-3.0.5-ldap/common/conflex.c
+--- dhcp-3.0.5/common/conflex.c 2006-02-22 17:43:27.000000000 -0500
++++ dhcp-3.0.5-ldap/common/conflex.c 2006-12-14 10:03:41.000000000 -0500
@@ -47,6 +47,7 @@
static enum dhcp_token read_number PROTO ((int, struct parse *));
static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
static enum dhcp_token intern PROTO ((char *, enum dhcp_token));
-+static char read_function PROTO ((struct parse *));
++static int read_function PROTO ((struct parse *));
isc_result_t new_parse (cfile, file, inbuf, buflen, name, eolp)
struct parse **cfile;
@@ -276,7 +469,7 @@
tmp -> bufix = 0;
tmp -> buflen = buflen;
if (inbuf) {
-@@ -109,22 +114,11 @@
+@@ -113,22 +118,11 @@
int c;
if (cfile -> bufix == cfile -> buflen) {
@@ -303,16 +496,16 @@
} else {
c = cfile -> inbuf [cfile -> bufix];
cfile -> bufix++;
-@@ -1071,3 +1065,25 @@
+@@ -1128,3 +1122,25 @@
}
return dfv;
}
+
+
-+static char
++static int
+read_function (struct parse * cfile)
+{
-+ char c;
++ int c;
+
+ cfile -> buflen = read (cfile -> file, cfile -> inbuf, cfile -> bufsiz);
+ if (cfile -> buflen == 0) {
@@ -329,9 +522,9 @@
+ return c;
+}
+
-diff -Naur dhcp-3.0.1rc14/common/print.c dhcp-3.0.1rc14-ldap/common/print.c
---- dhcp-3.0.1rc14/common/print.c 2004-06-17 16:54:39.000000000 -0400
-+++ dhcp-3.0.1rc14-ldap/common/print.c 2004-06-22 15:18:20.000000000 -0400
+diff -Naur dhcp-3.0.5/common/print.c dhcp-3.0.5-ldap/common/print.c
+--- dhcp-3.0.5/common/print.c 2006-02-22 17:43:27.000000000 -0500
++++ dhcp-3.0.5-ldap/common/print.c 2006-12-14 10:03:41.000000000 -0500
@@ -166,9 +166,9 @@
}
@@ -345,22 +538,10 @@
{
static char habuf [49];
char *s;
-diff -Naur dhcp-3.0.1rc14/configure dhcp-3.0.1rc14-ldap/configure
---- dhcp-3.0.1rc14/configure 2002-04-20 17:44:13.000000000 -0400
-+++ dhcp-3.0.1rc14-ldap/configure 2004-06-22 15:18:20.000000000 -0400
-@@ -256,4 +256,8 @@
- make links
- fi
-
-+mv $workname/server/Makefile $workname/server/Makefile.noldap
-+cat $workname/server/Makefile.noldap | sed '{s/^LIBS =/LIBS=-lldap -llber/}' > $workname/server/Makefile.ldap
-+ln $workname/server/Makefile.ldap $workname/server/Makefile
-+
- exit 0
-diff -Naur dhcp-3.0.1rc14/contrib/dhcp.schema dhcp-3.0.1rc14-ldap/contrib/dhcp.schema
---- dhcp-3.0.1rc14/contrib/dhcp.schema 1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-3.0.1rc14-ldap/contrib/dhcp.schema 2004-06-22 15:18:20.000000000 -0400
-@@ -0,0 +1,343 @@
+diff -Naur dhcp-3.0.5/contrib/dhcp.schema dhcp-3.0.5-ldap/contrib/dhcp.schema
+--- dhcp-3.0.5/contrib/dhcp.schema 1969-12-31 19:00:00.000000000 -0500
++++ dhcp-3.0.5-ldap/contrib/dhcp.schema 2007-02-23 12:53:22.000000000 -0500
+@@ -0,0 +1,462 @@
+attributetype ( 2.16.840.1.113719.1.203.4.1
+ NAME 'dhcpPrimaryDN'
+ EQUALITY distinguishedNameMatch
@@ -445,7 +626,8 @@
+ DESC 'The distinguished name of a client address.'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE)
+
-+attributetype ( 2.16.840.1.113719.1.203.4.15 NAME 'dhcpLeasesDN'
++attributetype ( 2.16.840.1.113719.1.203.4.15
++ NAME 'dhcpLeasesDN'
+ DESC 'The distinguished name(s) client addresses.'
+ EQUALITY distinguishedNameMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
@@ -475,7 +657,8 @@
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
+
+attributetype ( 2.16.840.1.113719.1.203.4.20
-+ NAME 'dhcpVersion' DESC 'The version attribute of this object.'
++ NAME 'dhcpVersion'
++ DESC 'The version attribute of this object.'
+ EQUALITY caseIgnoreIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
@@ -559,9 +742,9 @@
+
+attributetype ( 2.16.840.1.113719.1.203.4.34
+ NAME 'dhcpHWAddress'
-+ EQUALITY octetStringMatch
++ EQUALITY caseIgnoreIA5Match
+ DESC 'The clients hardware address that requested this IP address.'
-+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 2.16.840.1.113719.1.203.4.35
+ NAME 'dhcpHashBucketAssignment'
@@ -593,41 +776,137 @@
+ DESC 'Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
++attributetype ( 2.16.840.1.113719.1.203.4.40
++ NAME 'dhcpLocatorDN'
++ EQUALITY distinguishedNameMatch
++ DESC 'The DN of dhcpLocator object which contain the DNs of all DHCP configuration objects. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.41
++ NAME 'dhcpKeyAlgorithm'
++ EQUALITY caseIgnoreIA5Match
++ DESC 'Algorithm to generate TSIG Key'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
++
++attributetype ( 2.16.840.1.113719.1.203.4.42
++ NAME 'dhcpKeySecret'
++ EQUALITY octetStringMatch
++ DESC 'Secret to generate TSIG Key' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
++
++attributetype ( 2.16.840.1.113719.1.203.4.43
++ NAME 'dhcpDnsZoneServer'
++ EQUALITY caseIgnoreIA5Match
++ DESC 'Master server of the DNS Zone'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
++
++attributetype ( 2.16.840.1.113719.1.203.4.44
++ NAME 'dhcpKeyDN'
++ EQUALITY distinguishedNameMatch
++ DESC 'The DNs of TSIG Key to use in secure dynamic updates. In case of locator object, this will be list of TSIG keys. In case of DHCP Service, Shared Network, Subnet and DNS Zone, it will be a single key.'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
++
++attributetype ( 2.16.840.1.113719.1.203.4.45
++ NAME 'dhcpZoneDN'
++ EQUALITY distinguishedNameMatch
++ DESC 'The DNs of DNS Zone. In case of locator object, this will be list of DNS Zones in the tree. In case of DHCP Service, Shared Network and Subnet, it will be a single DNS Zone.'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
++
++attributetype ( 2.16.840.1.113719.1.203.4.46
++ NAME 'dhcpFailOverPrimaryServer'
++ EQUALITY caseIgnoreIA5Match
++ DESC 'IP address or DNS name of the server playing primary role in DHC Load Balancing and Fail over.'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.47
++ NAME 'dhcpFailOverSecondaryServer'
++ EQUALITY caseIgnoreIA5Match
++ DESC 'IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over.'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.48
++ NAME 'dhcpFailOverPrimaryPort'
++ EQUALITY integerMatch
++ DESC 'Port on which primary server listens for connections from its fail over peer (secondary server)'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.49
++ NAME 'dhcpFailOverSecondaryPort'
++ EQUALITY integerMatch
++ DESC 'Port on which secondary server listens for connections from its fail over peer (primary server)'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.50
++ NAME 'dhcpFailOverResponseDelay'
++ EQUALITY integerMatch
++ DESC 'Maximum response time in seconds, before Server assumes that connection to fail over peer has failed'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.51
++ NAME 'dhcpFailOverUnackedUpdates'
++ EQUALITY integerMatch
++ DESC 'Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.52
++ NAME 'dhcpFailOverSplit'
++ EQUALITY integerMatch
++ DESC 'Split between the primary and secondary servers for fail over purpose'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.53
++ NAME 'dhcpFailOverLoadBalanceTime'
++ EQUALITY integerMatch
++ DESC 'Cutoff time in seconds, after which load balance is disabled'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.54
++ NAME 'dhcpFailOverPeerDN'
++ EQUALITY distinguishedNameMatch
++ DESC 'The DNs of Fail over peers. In case of locator object, this will be list of fail over peers in the tree. In case of Subnet and pool, it will be a single Fail Over Peer'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
++
++#List of all servers in the tree
++attributetype ( 2.16.840.1.113719.1.203.4.55
++ NAME 'dhcpServerDN'
++ EQUALITY distinguishedNameMatch
++ DESC 'List of all DHCP Servers in the tree. Used by dhcpLocatorObject'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
++
++attributetype ( 2.16.840.1.113719.1.203.4.56
++ NAME 'dhcpComments'
++ EQUALITY caseIgnoreIA5Match
++ DESC 'Generic attribute that allows coments within any DHCP object'
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
++
+# Classes
+
+objectclass ( 2.16.840.1.113719.1.203.6.1
+ NAME 'dhcpService'
+ DESC 'Service object that represents the actual DHCP Service configuration. This is a container object.'
+ SUP top
-+ MUST (cn $ dhcpPrimaryDN)
-+ MAY ( dhcpSecondaryDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $
-+ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpOptionsDN $
-+ dhcpStatements ) )
++ MUST (cn)
++ MAY ( dhcpPrimaryDN $ dhcpSecondaryDN $ dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $dhcpComments $ dhcpOption) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.2
+ NAME 'dhcpSharedNetwork'
+ DESC 'This stores configuration information for a shared network.'
+ SUP top
+ MUST cn
-+ MAY ( dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpStatements)
-+ X-NDS_CONTAINMENT ('dhcpService' ) )
++ MAY ( dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpStatements $dhcpComments $ dhcpOption) X-NDS_CONTAINMENT ('dhcpService' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.3
+ NAME 'dhcpSubnet'
+ DESC 'This class defines a subnet. This is a container object.'
+ SUP top
+ MUST ( cn $ dhcpNetMask )
-+ MAY ( dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $
-+ dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpStatements)
-+ X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') )
++ MAY ( dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $ dhcpComments $ dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.4
+ NAME 'dhcpPool'
+ DESC 'This stores configuration information about a pool.'
+ SUP top
+ MUST ( cn $ dhcpRange )
-+ MAY (dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $
-+ dhcpStatements)
++ MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption )
+ X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.5
@@ -635,7 +914,7 @@
+ DESC 'Group object that lists host DNs and parameters. This is a container object.'
+ SUP top
+ MUST cn
-+ MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements )
++ MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption )
+ X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpService' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.6
@@ -643,7 +922,7 @@
+ DESC 'This represents information about a particular client'
+ SUP top
+ MUST cn
-+ MAY (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements)
++ MAY (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption)
+ X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' 'dhcpGroup') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.7
@@ -651,7 +930,7 @@
+ DESC 'Represents information about a collection of related clients.'
+ SUP top
+ MUST cn
-+ MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements)
++ MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption)
+ X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.8
@@ -659,28 +938,22 @@
+ DESC 'Represents information about a collection of related classes.'
+ SUP top
+ MUST cn
-+ MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements)
-+ X-NDS_CONTAINMENT 'dhcpClass' )
++ MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) X-NDS_CONTAINMENT 'dhcpClass' )
+
+objectclass ( 2.16.840.1.113719.1.203.6.9
+ NAME 'dhcpOptions'
+ DESC 'Represents information about a collection of options defined.'
+ SUP top AUXILIARY
+ MUST cn
-+ MAY ( dhcpOption )
-+ X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet'
-+ 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) )
++ MAY ( dhcpOption $ dhcpComments )
++ X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.10
+ NAME 'dhcpLeases'
+ DESC 'This class represents an IP Address, which may or may not have been leased.'
+ SUP top
+ MUST ( cn $ dhcpAddressState )
-+ MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $
-+ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $
-+ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $
-+ dhcpReservedForClient $ dhcpAssignedToClient $
-+ dhcpRelayAgentInfo $ dhcpHWAddress )
++ MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress )
+ X-NDS_CONTAINMENT ( 'dhcpService' 'dhcpSubnet' 'dhcpPool') )
+
+objectclass ( 2.16.840.1.113719.1.203.6.11
@@ -688,26 +961,53 @@
+ DESC 'This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.'
+ SUP top
+ MUST ( cn )
-+ MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $
-+ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $
-+ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $
-+ dhcpReservedForClient $ dhcpAssignedToClient $
-+ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog)
-+ X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet'
-+ 'dhcpSharedNetwork' 'dhcpService' ) )
++ MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog)
++ X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) )
+
+objectclass ( 2.16.840.1.113719.1.203.6.12
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/dhcp-ldap.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list