diff options
| author | David Hankins <dhankins@isc.org> | 2010-03-24 21:49:03 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2010-03-24 21:49:03 +0000 |
| commit | 33692791d72335f879cb8c36ed963659dd2f153e (patch) | |
| tree | f043e04509a6226106a855f83ee57b5170395d06 /server/confpars.c | |
| parent | f2d4f6445703d44380b836dc59ab0c4e469f1af3 (diff) | |
| download | isc-dhcp-33692791d72335f879cb8c36ed963659dd2f153e.tar.gz | |
- "The LDAP Patch" that has been circulating for some time, written by
Brian Masney and S.Kalyanasundraram and maintained for application to
the DHCP-4 sources by David Cantrell has been included. Please be
advised that these sources were contributed, and do not yet meet the
high standards we place on production sources we include by default.
As a result, the LDAP features are only included by using a compile-time
option which defaults off, and if you enable it you do so under your
own recognizance. We will be improving this software over time.
[ISC-Bugs #17741]
Diffstat (limited to 'server/confpars.c')
| -rw-r--r-- | server/confpars.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/server/confpars.c b/server/confpars.c index 27a692be..475db64a 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -61,7 +61,17 @@ void parse_trace_setup () isc_result_t readconf () { - return read_conf_file (path_dhcpd_conf, root_group, ROOT_GROUP, 0); + isc_result_t res; + + res = read_conf_file (path_dhcpd_conf, root_group, ROOT_GROUP, 0); +#if defined(LDAP_CONFIGURATION) + if (res != ISC_R_SUCCESS) + return (res); + + return ldap_read_config (); +#else + return (res); +#endif } isc_result_t read_conf_file (const char *filename, struct group *group, |