Description of problem:

I have been unable to use option to store the DHCP server configuration in LDAP
using the dhcp software provided by package dhcp-4.0.0-6.fc9.  This worked
(albeit with a few bugs) using the dhcp-3.0.6-12.fc8 version.  (I am currently
running Fedora 8 but I believe the problem isn't as a result of running the FC9
package on FC8).  Steps to reproduce below.

Version-Release number of selected component (if applicable):

4.0.0.6-fc9

How reproducible:


Steps to Reproduce:
1.  Install rpm
2.  Setup LDAP server per instructions in README.ldap
3.  Install the following /etc/dhcpd.conf

ldap-server "localhost";
ldap-port 389;
ldap-base-dn "dc=test,dc=cassatt,dc=com";
ldap-username "cn=Manager,dc=test,dc=cassatt,dc=com";
ldap-password "whatever";
ldap-method dynamic;

(substitute appropriate parameters for your ldap config)

3. # /usr/sbin/dhcpd -t -cf /etc/dhcpd.conf
  
Actual results:

Not searching LDAP since ldap-server, ldap-port and ldap-base-dn were not
specified in the config file.
Internet Systems Consortium DHCP Server V3.0.6-Fedora
Copyright 2004-2007 Internet Systems Consortium.
All rights reserved.
For info, please visit http://www.isc.org/sw/dhcp/

Expected results:

Internet Systems Consortium DHCP Server V3.0.6-Fedora
Copyright 2004-2007 Internet Systems Consortium.
All rights reserved.
For info, please visit http://www.isc.org/sw/dhcp/

Additional info:

I think one of the issues is related to a mis-match of defined option values for
the ldap-<blah> attributes.  From server/stables.c:

#if defined(LDAP_CONFIGURATION)
        { "ldap-server", "t",                           &server_universe,  57, 1 },
        { "ldap-port", "d",                                    
&server_universe,  58, 1 },
        { "ldap-username", "t",                         &server_universe,  59, 1 },
        { "ldap-password", "t",                         &server_universe,  60, 1 },
        { "ldap-base-dn", "t",                          &server_universe,  61, 1 },
        { "ldap-method", "Nldap-methods.",      &server_universe,  62, 1 },
        { "ldap-debug-file", "t",                       &server_universe,  63, 1 },
        { "ldap-dhcp-server-cn", "t",           &server_universe,  64, 1 },
        { "ldap-referrals", "f",                        &server_universe,  65, 1 },
#if defined(USE_SSL)
        { "ldap-ssl", "Nldap-ssl-usage.",       &server_universe,  66, 1 },
        { "ldap-tls-reqcert", "Nldap-tls-reqcert.",     &server_universe,  67, 1 },
        { "ldap-tls-ca-file", "t",                      &server_universe,  68, 1 },
        { "ldap-tls-ca-dir", "t",                       &server_universe,  69, 1 },
        { "ldap-tls-cert", "t",                         &server_universe,  70, 1 },
        { "ldap-tls-key", "t",                          &server_universe,  71, 1 },
        { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.",   &server_universe,  72, 1 },
        { "ldap-tls-ciphers", "t",                      &server_universe,  73, 1 },
        { "ldap-tls-randfile", "t",                     &server_universe,  74, 1 },

But in includes/dhcpd.h we have:

#if defined(LDAP_CONFIGURATION)
# define SV_LDAP_SERVER                         57
# define SV_LDAP_PORT                           58
# define SV_LDAP_USERNAME                       59
# define SV_LDAP_PASSWORD                       60
# define SV_LDAP_BASE_DN                        61
# define SV_LDAP_METHOD                         62
# define SV_LDAP_DEBUG_FILE                     63
# define SV_LDAP_DHCP_SERVER_CN         64
# define SV_LDAP_REFERRALS                      65
#if defined (USE_SSL)
# define SV_LDAP_SSL                            66
# define SV_LDAP_TLS_REQCERT            67
# define SV_LDAP_TLS_CA_FILE            68
# define SV_LDAP_TLS_CA_DIR                     69
# define SV_LDAP_TLS_CERT                       70
# define SV_LDAP_TLS_KEY                        71
# define SV_LDAP_TLS_CRLCHECK           72
# define SV_LDAP_TLS_CIPHERS            73
# define SV_LDAP_TLS_RANDFILE           74
#endif


These appear to be off by a factor of 10.

I updated these in dhcp-4.0.0-ldap-configuration.patch and regenerated via
rpmbuild -bb dhcp.spec but then attempting to start/check the config of dhcp
resulted in a segfault.  I'm willing to believe though that this is due to the
OS mis-match as the stack trace ended up in a function in a system library. 
Don't have that handy but can reproduce if needed.

One thing also that I notice is that there seems to be a mis-match in how the
dhcpRange is interpreted when in a subnet via when it is in a pool:

In ldap_parse_subnet function in ldap.c:

  if ((tempbv = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
    {
      for (i=0; tempbv[i] != NULL; i++)
        {
          x_strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
          x_strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
          x_strncat (cfile->inbuf, tempbv[i]->bv_val, LDAP_BUFFER_SIZE);
          x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
        }
    }

But in the ldap_parse_pool function in that same file, we have:


  if ((tempbv = ldap_get_values_len (ld, item->ldent, "dhcpRange")) != NULL)
    {
      x_strncat (cfile->inbuf, "range", LDAP_BUFFER_SIZE);
      for (i=0; tempbv[i] != NULL; i++)
        {
          x_strncat (cfile->inbuf, " ", LDAP_BUFFER_SIZE);
          x_strncat (cfile->inbuf, tempbv[i]->bv_val, LDAP_BUFFER_SIZE);
        }
       x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
    }

I believe these should parse the range statements identically.

Please let me know if there is any additional info you need.