From 1d7a266b24009f3bf60262088b2c59e4075790a9 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Dec 04 2008 22:08:05 +0000 Subject: - Enable LDAP/SSL support in dhcpd (#467740) - Do not calculate a prefix for an address we did not receive (#473885) - Removed libdhcp4client because libdhcp has been removed from Fedora --- diff --git a/dhclient-script b/dhclient-script index 36ca76e..5008b0b 100755 --- a/dhclient-script +++ b/dhclient-script @@ -215,7 +215,7 @@ dhconfig() { [ ! "${old_ip_address}" = "${new_ip_address}" ]; then # IP address changed. Bringing down the interface will delete all # routes, and clear the ARP cache. - ip -family inet addr flush dev ${interface} + ip -family inet addr flush dev ${interface} >/dev/null 2>&1 ip -family inet link set dev ${interface} down fi @@ -319,7 +319,7 @@ dhconfig() { if [ ! "${new_ip_address}" = "${alias_ip_address}" ] && [ -n "${alias_ip_address}" ]; then - ip -family inet addr flush dev ${interface}:0 + ip -family inet addr flush dev ${interface}:0 >/dev/null 2>&1 ip -family inet addr add ${alias_ip_address}/${alias_prefix} dev ${interface}:0 ip route replace ${alias_ip_address}/32 dev ${interface}:0 fi @@ -413,6 +413,15 @@ dhconfig() { fi } +get_prefix() { + ip="${1}" + nm="${2}" + + if [ -n "${ip}" -a -n "${nm}" ]; then + ipcalc -s -p ${ip} ${nm} | cut -d '=' -f 2 + fi +} + # # ### MAIN @@ -450,24 +459,13 @@ if [ -f /etc/sysconfig/networking/network ]; then . /etc/sysconfig/networking/network fi -CONFIG="${interface}" +CONFIG="/etc/sysconfig/network-scripts/ifcfg-${interface}" need_config ${CONFIG} +source_config >/dev/null 2>&1 -if [ -f "${CONFIG}" ]; then - source_config -fi - -if [ -n "${new_subnet_mask}" ]; then - new_prefix="$(ipcalc -p ${new_ip_address} ${new_subnet_mask} | cut -d '=' -f 2)" -fi - -if [ -n "${old_subnet_mask}" ]; then - old_prefix="$(ipcalc -p ${old_ip_address} ${new_subnet_mask} | cut -d '=' -f 2)" -fi - -if [ -n "${alias_subnet_mask}" ]; then - alias_prefix="$(ipcalc -p ${alias_ip_address} ${alias_subnet_mask} | cut -d '=' -f 2)" -fi +new_prefix="$(get_prefix ${new_ip_address} ${new_subnet_mask})" +old_prefix="$(get_prefix ${old_ip_address} ${new_subnet_mask})" +alias_prefix="$(get_prefix ${alias_ip_address} ${alias_subnet_mask})" case "${reason}" in MEDIUM) @@ -484,7 +482,7 @@ case "${reason}" in if [ "${keep_old_ip}" = "yes" ]; then ip -family inet link set ${interface} up else - ip -family inet addr flush dev ${interface} + ip -family inet addr flush dev ${interface} >/dev/null 2>&1 ip -family inet link set ${interface} up fi @@ -556,7 +554,7 @@ case "${reason}" in if [ -n "${old_ip_address}" ]; then # Shut down interface, which will delete routes and clear arp cache. - ip -family inet addr flush dev ${interface} + ip -family inet addr flush dev ${interface} >/dev/null 2>&1 ip -family inet link set ${interface} down fi @@ -571,7 +569,7 @@ case "${reason}" in TIMEOUT) if [ -n "${new_routers}" ]; then if [ -n "${alias_ip_address}" ]; then - ip -family inet addr flush dev ${interface}:0 + ip -family inet addr flush dev ${interface}:0 >/dev/null 2>&1 fi ip -family inet addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} @@ -582,7 +580,7 @@ case "${reason}" in exit_with_hooks 0 fi - ip -family inet addr flush dev ${interface} + ip -family inet addr flush dev ${interface} >/dev/null 2>&1 ip -family inet link set ${interface} down exit_with_hooks 1 else diff --git a/dhcp-4.0.0-libdhcp4client.patch b/dhcp-4.0.0-libdhcp4client.patch deleted file mode 100644 index 324a68f..0000000 --- a/dhcp-4.0.0-libdhcp4client.patch +++ /dev/null @@ -1,1226 +0,0 @@ -diff -up dhcp-4.0.0//client/Makefile.am.libdhcp4client dhcp-4.0.0//client/Makefile.am ---- dhcp-4.0.0//client/Makefile.am.libdhcp4client 2007-12-12 09:23:42.000000000 -1000 -+++ dhcp-4.0.0//client/Makefile.am 2008-08-01 10:17:46.000000000 -1000 -@@ -1,10 +1,18 @@ - dist_sysconf_DATA = dhclient.conf - sbin_PROGRAMS = dhclient -+lib_LTLIBRARIES = libdhcp4client.la - dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ - scripts/bsdos scripts/freebsd scripts/linux scripts/netbsd \ - scripts/nextstep scripts/openbsd scripts/solaris - dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \ - ../omapip/libomapi.a ../dst/libdst.a -+libdhcp4client_la_CFLAGS = -DLIBDHCP -DLOCALSTATEDIR='"@localstatedir@"' -+libdhcp4client_la_LDFLAGS = -version-info \ -+ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -+ -release $(LT_RELEASE) -+libdhcp4client_la_SOURCES = clparse.c dhclient.c dhc6.c -+libdhcp4client_la_LIBADD = ../common/libdhcpLIBDHCP.a ../minires/libres.a \ -+ ../omapip/libomapiLIBDHCP.a ../dst/libdstLIBDHCP.a - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) - -diff -up dhcp-4.0.0//client/dhclient.c.libdhcp4client dhcp-4.0.0//client/dhclient.c ---- dhcp-4.0.0//client/dhclient.c.libdhcp4client 2008-08-01 10:17:46.000000000 -1000 -+++ dhcp-4.0.0//client/dhclient.c 2008-08-01 10:17:46.000000000 -1000 -@@ -83,14 +83,50 @@ int nowait=0; - char *mockup_relay = NULL; - int bootp_broadcast_always = 0; - -+#ifdef LIBDHCP -+FILE *leaseFile = NULL; -+#endif -+ - extern u_int32_t default_requested_options[]; - - static void usage PROTO ((void)); - - static isc_result_t write_duid(struct data_string *duid); - --int --main(int argc, char **argv) { -+#ifdef LIBDHCP -+#include "isc-dhcp/libdhcp_control.h" -+LIBDHCP_Control *libdhcp_control; -+static void libdhcp_dispatch(void) -+{ -+ struct timeval tv = { 0, 0 }, *tvp; -+ isc_result_t status; -+ -+ /* Wait for a packet, or a timeout, or libdhcp being finished */ -+ do { -+ tvp = process_outstanding_timeouts(&tv); -+ status = omapi_one_dispatch(0, tvp); -+ -+ if (libdhcp_control && ((status == ISC_R_TIMEDOUT) || (libdhcp_control->timeout && (time(NULL) >= (libdhcp_control->timeout + libdhcp_control->now))))) { -+ if (libdhcp_control->callback) -+ libdhcp_control->callback(libdhcp_control, DHC_TIMEDOUT, NULL); -+ -+ break; -+ } -+ } while ((status != ISC_R_TIMEDOUT) && ((!libdhcp_control) || (!(libdhcp_control->finished)))); -+} -+ -+extern void omapi_free_all_pointers(void); -+ -+__attribute__ ((visibility ("default"))) -+int dhcpv4_client (LIBDHCP_Control *libdhcp_ctl, int argc, char **argv, -+ char **envp) -+#else -+int main(int argc, char **argv, char **envp) -+#endif -+{ -+#ifdef LIBDHCP -+ libdhcp_control = libdhcp_ctl; -+#endif - int fd; - int i; - struct interface_info *ip; -@@ -122,6 +158,7 @@ main(int argc, char **argv) { - /* Initialize client globals. */ - memset(&default_duid, 0, sizeof(default_duid)); - -+#ifndef LIBDHCP - /* Make sure that file descriptors 0 (stdin), 1, (stdout), and - 2 (stderr) are open. To do this, we assume that when we - open a file the lowest available file descriptor is used. */ -@@ -140,6 +177,7 @@ main(int argc, char **argv) { - #if !(defined (DEBUG) || defined (__CYGWIN32__)) - setlogmask (LOG_UPTO (LOG_INFO)); - #endif -+#endif - - /* Set up the OMAPI. */ - status = omapi_init (); -@@ -485,8 +523,12 @@ main(int argc, char **argv) { - } - } - -+#ifdef LIBDHCP -+ if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_PID_FILE)) -+#endif - write_client_pid_file(); - -+#ifndef LIBDHCP - if (!quiet) { - log_info ("%s %s", message, PACKAGE_VERSION); - log_info (copyright); -@@ -497,6 +539,7 @@ main(int argc, char **argv) { - log_perror = 0; - quiet_interface_discovery = 1; - } -+#endif - - /* If we're given a relay agent address to insert, for testing - purposes, figure out what it is. */ -@@ -702,11 +745,17 @@ main(int argc, char **argv) { - arg_conf_len = 0; - } - -+#ifdef LIBDHCP -+ if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)) { -+#endif - /* Parse the lease database. */ - read_client_leases (); - - /* Rewrite the lease database... */ - rewrite_client_leases (); -+#ifdef LIBDHCP -+ } -+#endif - - /* XXX */ - /* config_counter(&snd_counter, &rcv_counter); */ -@@ -725,7 +774,7 @@ main(int argc, char **argv) { - if (!persist) { - /* Nothing more to do. */ - log_info ("No broadcast interfaces found - exiting."); -- exit (0); -+ return (0); - } - } else if (!release_mode && !exit_mode) { - /* Call the script with the list of interfaces. */ -@@ -863,6 +912,7 @@ main(int argc, char **argv) { - dmalloc_outstanding = 0; - #endif - -+#ifndef LIBDHCP - /* If we're not supposed to wait before getting the address, - don't. */ - if (nowait) -@@ -875,6 +925,132 @@ main(int argc, char **argv) { - - /* Start dispatching packets and timeouts... */ - dispatch (); -+#else -+ if (libdhcp_control) { -+ if (libdhcp_control->timeout) -+ libdhcp_control->now = time(NULL); -+ else -+ libdhcp_control->now = 0; -+ } -+ -+ libdhcp_dispatch(); -+ -+ /* libdhcp is finished with us. */ -+ -+ /* close all file descriptors: */ -+ for (ip = interfaces; ip; ip = ip->next) { -+ shutdown(ip->wfdesc, SHUT_RDWR); -+ close(ip->wfdesc); -+ -+ if (ip->rfdesc != ip->wfdesc) -+ close(ip->rfdesc); -+ } -+ -+ if (fallback_interface != 0) { -+ ip = fallback_interface; -+ shutdown(ip->wfdesc, SHUT_RDWR); -+ close(ip->wfdesc); -+ -+ if (ip->rfdesc != ip->wfdesc) -+ close(ip->rfdesc); -+ } -+ -+ if (leaseFile) -+ fclose (leaseFile); -+ -+ closelog(); -+ -+ char *current_pid_file = _PATH_DHCLIENT_PID; -+ -+ /* Free ALL allocated memory: */ -+ omapi_free_all_pointers(); -+ -+ /* Re-Initialize globals: */ -+ client_env = 0; -+ client_env_count = 0; -+ default_lease_time = 43200; -+ -+ dhcp_max_agent_option_packet_length = 0; -+ iaddr_any.len = 4; -+ memset(&(iaddr_any.iabuf[0]), '\0', 4); -+ iaddr_broadcast.len = 4; -+ memset(&(iaddr_broadcast.iabuf[0]), 0xff, 4); -+ interfaces_requested = 0; -+ leaseFile = 0; -+ -+ libdhcp_control = 0; -+ -+ local_port = 0; -+ no_daemon = 0; -+ nowait = 0; -+ onetry = 0; -+ quiet = 0; -+ max_lease_time = 86400; -+ path_dhclient_conf = _PATH_DHCLIENT_CONF; -+ path_dhclient_db = _PATH_DHCLIENT_DB; -+ path_dhclient_pid = _PATH_DHCLIENT_PID; -+ strcpy(&(path_dhclient_script_array[0]), _PATH_DHCLIENT_SCRIPT); -+ path_dhclient_script = path_dhclient_script_array; -+ remote_port = 0; -+ resolver_inited = 0; -+ log_perror = 1; -+ global_scope = NULL; -+ root_group = NULL; -+ group_name_hash = NULL; -+ interfaces = NULL; -+ dummy_interfaces = NULL; -+ fallback_interface = NULL; -+ extern int have_setup_fallback; -+ have_setup_fallback = 0; -+ quiet_interface_discovery = 1; -+#ifndef LIBDHCP -+ timeouts = NULL; -+#endif -+ dhcp_type_interface = NULL; -+ interface_vector = NULL; -+ interface_count = 0; -+ interface_max = 0; -+ name_servers = 0; -+ domains = 0; -+ dhcp_type_interface = NULL; -+ dhcp_type_group = NULL; -+ dhcp_type_shared_network = NULL; -+ dhcp_type_control = NULL; -+ memset(&dhcp_universe, '\0', sizeof(struct universe)); -+ memset(&dhcpv6_universe, '\0', sizeof(struct universe)); -+ memset(&nwip_universe, '\0', sizeof(struct universe)); -+ memset(&fqdn_universe, '\0', sizeof(struct universe)); -+ memset(&vendor_class_universe, '\0', sizeof(struct universe)); -+ memset(&vendor_universe, '\0', sizeof(struct universe)); -+ memset(&vsio_universe, '\0', sizeof(struct universe)); -+ memset(&isc_universe, '\0', sizeof(struct universe)); -+ memset(&isc6_universe, '\0', sizeof(struct universe)); -+ universe_hash = 0; -+ universes = 0; -+ universe_count = 0; -+ universe_max = 0; -+ config_universe = 0; -+ extern struct hash_bucket *free_hash_buckets; -+ free_hash_buckets = NULL; -+ extern struct dhcp_packet *dhcp_free_list; -+ dhcp_free_list = NULL; -+ extern struct packet *packet_free_list; -+ packet_free_list = NULL; -+ extern struct binding_value *free_binding_values; -+ free_binding_values = NULL; -+ extern struct expression *free_expressions; -+ free_expressions = NULL; -+ extern struct option_cache *free_option_caches; -+ free_option_caches = NULL; -+ extern struct packet *free_packets; -+ free_packets = NULL; -+ extern pair free_pairs; -+ free_pairs = NULL; -+ extern omapi_io_object_t omapi_io_states; -+ memset(&omapi_io_states, '\0', sizeof(omapi_io_states)); -+ dhcp_control_object = NULL; -+ unlink(current_pid_file); -+#endif - - /*NOTREACHED*/ - return 0; -@@ -1270,7 +1446,20 @@ void dhcpack (packet) - if (client -> new -> rebind < cur_time) - client -> new -> rebind = TIME_MAX; - -+#ifdef LIBDHCP -+ /* We need the server's siaddr for the 'bootServer' -+ * pump option -+ */ -+ u_int32_t set_siaddr = 0; -+ set_siaddr = client->packet.siaddr.s_addr; -+ client->packet.siaddr.s_addr = packet->raw->siaddr.s_addr; -+#endif -+ - bind_lease (client); -+ -+#ifdef LIBDHCP -+ client->packet.siaddr.s_addr = set_siaddr; -+#endif - } - - void bind_lease (client) -@@ -1306,6 +1495,9 @@ void bind_lease (client) - return; - } - -+#ifdef LIBDHCP -+ if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)) -+#endif - /* Write out the new lease. */ - write_client_lease (client, client -> new, 0, 0); - -@@ -1398,10 +1590,12 @@ void state_stop (cpp) - } - } - -+#ifndef LIBDHCP - int commit_leases () - { - return 0; - } -+#endif - - int write_lease (lease) - struct lease *lease; -@@ -2074,6 +2268,10 @@ void state_panic (cpp) - tell the shell script that we failed to allocate an address, - and try again later. */ - if (onetry) { -+#ifdef LIBDHCP -+ script_init (client, "FAIL", (struct string_list *)0); -+ return; -+#endif - if (!quiet) - log_info ("Unable to obtain a lease on first try.%s", - " Exiting."); -@@ -2691,7 +2889,9 @@ void destroy_client_lease (lease) - free_client_lease (lease, MDL); - } - -+#ifndef LIBDHCP - FILE *leaseFile = NULL; -+#endif - int leases_written = 0; - - void rewrite_client_leases () -@@ -3235,6 +3435,54 @@ void script_write_params (client, prefix - int script_go (client) - struct client_state *client; - { -+#ifdef LIBDHCP -+ struct string_list *sp; -+ -+ if (libdhcp_control && libdhcp_control->callback) { -+ int dhcmsg; -+ char *reason=""; -+ -+ for (sp = client->env; sp; sp = sp->next) -+ if (strncmp(sp->string, "reason=", 7) == 0) { -+ reason = sp->string + 7; -+ break; -+ } -+ -+ if (strcmp(reason,"NBI") == 0) -+ dhcmsg = DHC4_NBI; -+ else if (strcmp(reason,"PREINIT") == 0) -+ dhcmsg = DHC4_PREINIT; -+ else if (strcmp(reason,"BOUND") == 0) -+ dhcmsg = DHC4_BOUND; -+ else if (strcmp(reason,"RENEW") == 0) -+ dhcmsg = DHC4_RENEW; -+ else if (strcmp(reason,"REBOOT") == 0) -+ dhcmsg = DHC4_REBOOT; -+ else if (strcmp(reason,"REBIND") == 0) -+ dhcmsg = DHC4_REBIND; -+ else if (strcmp(reason,"STOP") == 0) -+ dhcmsg = DHC4_STOP; -+ else if (strcmp(reason,"MEDIUM") == 0) -+ dhcmsg = DHC4_MEDIUM; -+ else if (strcmp(reason,"TIMEOUT") == 0) -+ dhcmsg = DHC4_TIMEOUT; -+ else if (strcmp(reason,"FAIL") == 0) -+ dhcmsg = DHC4_FAIL; -+ else if (strcmp(reason,"EXPIRE") == 0) -+ dhcmsg = DHC4_EXPIRE; -+ else if (strcmp(reason,"RELEASE") == 0) -+ dhcmsg = DHC4_RELEASE; -+ else -+ dhcmsg = DHC4_NBI; -+ -+ (*libdhcp_control->callback) (libdhcp_control, dhcmsg, client); -+ -+ if (libdhcp_control->decline) -+ return 1; -+ } -+ -+ return 0; -+#else - char *scriptName; - char *argv [2]; - char **envp; -@@ -3311,6 +3559,7 @@ int script_go (client) - time(&cur_time); - return (WIFEXITED (wstatus) ? - WEXITSTATUS (wstatus) : -WTERMSIG (wstatus)); -+#endif - } - - void client_envadd (struct client_state *client, -@@ -3393,6 +3642,9 @@ void go_daemon () - - /* Don't become a daemon if the user requested otherwise. */ - if (no_daemon) { -+#ifdef LIBDHCP -+ if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_PID_FILE)) -+#endif - write_client_pid_file (); - return; - } -@@ -3402,6 +3654,10 @@ void go_daemon () - return; - state = 1; - -+#ifdef LIBDHCP -+ return; -+#endif -+ - /* Stop logging to stderr... */ - log_perror = 0; - -diff -up dhcp-4.0.0//common/Makefile.am.libdhcp4client dhcp-4.0.0//common/Makefile.am ---- dhcp-4.0.0//common/Makefile.am.libdhcp4client 2007-11-16 01:04:11.000000000 -1000 -+++ dhcp-4.0.0//common/Makefile.am 2008-08-01 10:17:46.000000000 -1000 -@@ -1,11 +1,17 @@ - AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' - --noinst_LIBRARIES = libdhcp.a -+noinst_LIBRARIES = libdhcp.a libdhcpLIBDHCP.a - libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \ - dispatch.c dlpi.c dns.c ethernet.c execute.c fddi.c \ - icmp.c inet.c lpf.c memory.c nit.c options.c packet.c \ - parse.c print.c raw.c resolv.c socket.c tables.c tr.c \ - tree.c upf.c heap.c -+libdhcpLIBDHCP_a_CFLAGS = -DLIBDHCP -+libdhcpLIBDHCP_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c \ -+ discover.c dispatch.c dlpi.c dns.c ethernet.c \ -+ execute.c inet.c lpf.c memory.c nit.c options.c \ -+ packet.c parse.c print.c resolv.c socket.c \ -+ tables.c tr.c tree.c upf.c - man_MANS = dhcp-eval.5 dhcp-options.5 - EXTRA_DIST = $(man_MANS) - -diff -up dhcp-4.0.0//common/alloc.c.libdhcp4client dhcp-4.0.0//common/alloc.c ---- dhcp-4.0.0//common/alloc.c.libdhcp4client 2007-10-23 14:54:11.000000000 -1000 -+++ dhcp-4.0.0//common/alloc.c 2008-08-01 10:17:46.000000000 -1000 -@@ -1004,7 +1004,11 @@ int executable_statement_reference (ptr, - return 1; - } - -+#ifdef LIBDHCP -+struct packet *free_packets; -+#else - static struct packet *free_packets; -+#endif - - #if defined (DEBUG_MEMORY_LEAKAGE) || \ - defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT) -diff -up dhcp-4.0.0//common/discover.c.libdhcp4client dhcp-4.0.0//common/discover.c ---- dhcp-4.0.0//common/discover.c.libdhcp4client 2007-10-05 12:29:51.000000000 -1000 -+++ dhcp-4.0.0//common/discover.c 2008-08-01 10:17:46.000000000 -1000 -@@ -883,6 +883,10 @@ add_ipv6_addr_to_interface(struct interf - register that interface with the network I/O software, figure out what - subnet it's on, and add it to the list of interfaces. */ - -+#ifdef LIBDHCP -+int have_setup_fallback = 0; -+#endif -+ - void - discover_interfaces(int state) { - struct iface_conf_list ifaces; -@@ -902,7 +906,9 @@ discover_interfaces(int state) { - isc_result_t status; - int wifcount = 0; - -+#ifndef LIBDHCP - static int setup_fallback = 0; -+#endif - - if (!begin_iface_scan(&ifaces)) { - log_fatal("Can't get list of interfaces."); -@@ -1242,10 +1248,17 @@ discover_interfaces(int state) { - log_fatal ("Not configured to listen on any interfaces!"); - } - -+#ifdef LIBDHCP -+ if ((local_family == AF_INET) && !have_setup_fallback) { -+ have_setup_fallback = 1; -+ maybe_setup_fallback (); -+ } -+#else - if ((local_family == AF_INET) && !setup_fallback) { - setup_fallback = 1; - maybe_setup_fallback(); - } -+#endif - - #if defined (F_SETFD) - if (fallback_interface) { -diff -up dhcp-4.0.0//common/dispatch.c.libdhcp4client dhcp-4.0.0//common/dispatch.c ---- dhcp-4.0.0//common/dispatch.c.libdhcp4client 2008-08-01 10:17:45.000000000 -1000 -+++ dhcp-4.0.0//common/dispatch.c 2008-08-01 10:17:46.000000000 -1000 -@@ -34,8 +34,24 @@ - - #include "dhcpd.h" - --struct timeout *timeouts; --static struct timeout *free_timeouts; -+struct timeout { -+#ifndef LIBDHCP -+ struct timeout *next; -+#endif -+ TIME when; -+ void (*func) PROTO ((void *)); -+ void *what; -+ tvref_t ref; -+ tvunref_t unref; -+}; -+ -+#ifdef LIBDHCP -+static struct timeout *timeouts = NULL; -+static int ntimeouts = 0; -+#else -+static struct timeout *timeouts = NULL; -+static struct timeout *free_timeouts = NULL; -+#endif - - void set_time(TIME t) - { -@@ -48,9 +64,41 @@ void set_time(TIME t) - - struct timeval *process_outstanding_timeouts (struct timeval *tvp) - { -+#ifdef LIBDHCP -+ int i; -+ struct timeout t = { 0 }; -+#endif - /* Call any expired timeouts, and then if there's - still a timeout registered, time out the select - call then. */ -+#ifdef LIBDHCP -+ if (!ntimeouts) -+ return NULL; -+ -+ for (i = 0; i < ntimeouts && timeouts[i].when <= cur_time;) { -+ struct timeout *new_timeouts; -+ size_t n; -+ -+ memmove(&t, &timeouts[i], sizeof (t)); -+ -+ n = (ntimeouts - i - 1) * sizeof (t); -+ memmove(&timeouts[i+1], &timeouts[i], n); -+ -+ n = --ntimeouts * sizeof (t); -+ new_timeouts = realloc(timeouts, n); -+ /* XXX broken API, no way to return error here */ -+ if (new_timeouts || !n) -+ timeouts = new_timeouts; -+ -+ if (t.func) -+ t.func(t.what); -+ if (t.unref) -+ t.unref(t.what, MDL); -+ } -+ if (tvp && ntimeouts) { -+ tvp->tv_sec = timeouts[0].when; -+ tvp->tv_usec = 0; -+#else - another: - if (timeouts) { - struct timeout *t; -@@ -68,9 +116,15 @@ struct timeval *process_outstanding_time - tvp -> tv_sec = timeouts -> when; - tvp -> tv_usec = 0; - } -+#endif - return tvp; -+#ifdef LIBDHCP -+ } -+ return NULL; -+#else - } else - return (struct timeval *)0; -+#endif - } - - /* Wait for packets to come in using select(). When one does, call -@@ -99,13 +153,28 @@ void add_timeout (when, where, what, ref - tvref_t ref; - tvunref_t unref; - { -+#ifdef LIBDHCP -+ struct timeout t = { -+ .when = when, -+ .func = where, -+ .what = what, -+ .ref = ref, -+ .unref = unref -+ }; -+ struct timeout *new_timeouts; -+ int i, pos = 0; -+#else - struct timeout *t, *q; -+#endif - - /* See if this timeout supersedes an existing timeout. */ -+#ifdef LIBDHCP -+ for (i = 0; i < ntimeouts; i++) { -+ struct timeout *q = &timeouts[i]; -+#else - t = (struct timeout *)0; - for (q = timeouts; q; q = q -> next) { -- if ((where == NULL || q -> func == where) && -- q -> what == what) { -+ if ((where == NULL || q -> func == where) && q -> what == what) { - if (t) - t -> next = q -> next; - else -@@ -114,7 +183,29 @@ void add_timeout (when, where, what, ref - } - t = q; - } -+#endif - -+#ifdef LIBDHCP -+ /* If this one is already in the list with a different time, -+ * remove it and re-add */ -+ if ((where == NULL || q->func == where) && -+ q->what == what) { -+ size_t n = (--ntimeouts - i) * sizeof (*q); -+ memmove(&t, q, sizeof (t)); -+ -+ if (n) -+ memmove(&timeouts[i], &timeouts[i+1], n); -+ -+ if (ntimeouts) { -+ new_timeouts = realloc(timeouts, ntimeouts * sizeof (*q)); -+ /* XXX broken API, no way to return error here */ -+ if (new_timeouts) -+ timeouts = new_timeouts; -+ } else { -+ timeouts = NULL; -+ } -+ add_timeout(when, where, what, ref, unref); -+#else - /* If we didn't supersede a timeout, allocate a timeout - structure now. */ - if (!q) { -@@ -123,7 +214,7 @@ void add_timeout (when, where, what, ref - free_timeouts = q -> next; - } else { - q = ((struct timeout *) -- dmalloc (sizeof (struct timeout), MDL)); -+ dmalloc (sizeof (struct timeout), MDL)); - if (!q) - log_fatal ("add_timeout: no memory!"); - } -@@ -153,22 +244,76 @@ void add_timeout (when, where, what, ref - if (t -> next -> when > q -> when) { - q -> next = t -> next; - t -> next = q; -+#endif - return; -+#ifdef LIBDHCP -+ } else if (timeouts[i].when > when) { -+ pos = i; -+#endif - } - } - -+#ifdef LIBDHCP -+ /* If we didn't supersede an existing timeout, then pos is set -+ * to the timeout which will post after this one. Insert this -+ * one before it. */ -+ -+ new_timeouts = realloc(timeouts, sizeof (t) * (ntimeouts+1)); -+ /* XXX broken API, no way to return error here */ -+ if (new_timeouts) { -+ /* ntimeouts = 10 -+ * pos = 3; -+ * n = 10-3 * sizeof (t) = 7 * sizeof (t) -+ */ -+ size_t n = (ntimeouts - pos) * sizeof (t); -+ -+ timeouts = new_timeouts; -+ memmove(&timeouts[pos+1], &timeouts[pos], n); -+ memmove(&timeouts[pos], &t, sizeof (t)); -+ ntimeouts++; -+ } -+#else - /* End of list. */ - t -> next = q; - q -> next = (struct timeout *)0; -+#endif - } - - void cancel_timeout (where, what) - void (*where) PROTO ((void *)); - void *what; - { -+#ifdef LIBDHCP -+ struct timeout t; -+ int i = 0; -+#else - struct timeout *t, *q; -+#endif - - /* Look for this timeout on the list, and unlink it if we find it. */ -+#ifdef LIBDHCP -+ for (i = 0; i < ntimeouts; i++) { -+ struct timeout *new_timeouts, *q = &timeouts[i]; -+ -+ if (q->func == where && q->what == what) { -+ size_t n; -+ -+ memmove(&t, q, sizeof (t)); -+ -+ n = (ntimeouts - i - 1) * sizeof (t); -+ memmove(&timeouts[i+1], &timeouts[i], n); -+ -+ n = --ntimeouts * sizeof (t); -+ new_timeouts = realloc(timeouts, n); -+ /* XXX broken API, no way to return error here */ -+ if (new_timeouts || !n) -+ timeouts = new_timeouts; -+ -+ if (t.unref) -+ t.unref(t.what, MDL); -+ } -+ } -+#else - t = (struct timeout *)0; - for (q = timeouts; q; q = q -> next) { - if (q -> func == where && q -> what == what) { -@@ -188,10 +333,15 @@ void cancel_timeout (where, what) - q -> next = free_timeouts; - free_timeouts = q; - } -+#endif - } - - void cancel_all_timeouts () - { -+#ifdef LIBDHCP -+ cur_time = TIME_MAX; -+ process_outstanding_timeouts(NULL); -+#else - struct timeout *t, *n; - for (t = timeouts; t; t = n) { - n = t -> next; -@@ -200,13 +350,20 @@ void cancel_all_timeouts () - t -> next = free_timeouts; - free_timeouts = t; - } -+#endif - } - -+__attribute__ ((visibility ("default"))) - void relinquish_timeouts () - { -+#ifdef LIBDHCP -+ while (ntimeouts) -+ cancel_timeout(timeouts[0].func, timeouts[0].what); -+#else - struct timeout *t, *n; - for (t = free_timeouts; t; t = n) { - n = t -> next; - dfree (t, MDL); - } -+#endif - } -diff -up dhcp-4.0.0//common/options.c.libdhcp4client dhcp-4.0.0//common/options.c ---- dhcp-4.0.0//common/options.c.libdhcp4client 2007-11-30 11:51:43.000000000 -1000 -+++ dhcp-4.0.0//common/options.c 2008-08-01 10:17:46.000000000 -1000 -@@ -3392,6 +3392,7 @@ fqdn6_universe_decode(struct option_stat - return 0; - } - -+__attribute__ ((visibility ("default"))) - void option_space_foreach (struct packet *packet, struct lease *lease, - struct client_state *client_state, - struct option_state *in_options, -diff -up dhcp-4.0.0//common/tree.c.libdhcp4client dhcp-4.0.0//common/tree.c ---- dhcp-4.0.0//common/tree.c.libdhcp4client 2007-08-22 03:41:37.000000000 -1000 -+++ dhcp-4.0.0//common/tree.c 2008-08-01 10:17:46.000000000 -1000 -@@ -41,7 +41,7 @@ - # include - #endif - --struct binding_scope *global_scope; -+struct binding_scope __attribute__ ((visibility ("default"))) *global_scope; - - static int do_host_lookup PROTO ((struct data_string *, - struct dns_host_entry *)); -@@ -2859,6 +2859,7 @@ int evaluate_numeric_expression (result, - result of that evaluation. There should never be both an expression - and a valid data_string. */ - -+__attribute__ ((visibility ("default"))) - int evaluate_option_cache (result, packet, lease, client_state, - in_options, cfg_options, scope, oc, file, line) - struct data_string *result; -diff -up dhcp-4.0.0//configure.ac.libdhcp4client dhcp-4.0.0//configure.ac ---- dhcp-4.0.0//configure.ac.libdhcp4client 2007-12-14 08:24:56.000000000 -1000 -+++ dhcp-4.0.0//configure.ac 2008-08-01 10:17:46.000000000 -1000 -@@ -1,5 +1,32 @@ - AC_INIT([DHCP], [4.0.0], [dhcp-users@isc.org]) - -+dnl Versioning -+dnl (from glib's configure.in ...) -+dnl Making releases: -+dnl DHCP_MICRO_VERSION += 1; -+dnl DHCP_INTERFACE_AGE += 1; -+dnl DHCP_BINARY_AGE += 1; -+dnl if any functions have been added, set DHCP_INTERFACE_AGE to 0. -+dnl if backwards compatibility has been broken (e.g., functions removed, -+dnl function signatures changed), -+dnl set DHCP_BINARY_AGE and DHCP_INTERFACE_AGE to 0. -+DHCP_MAJOR_VERSION=4 -+DHCP_MINOR_VERSION=0 -+DHCP_MICRO_VERSION=0 -+DHCP_INTERFACE_AGE=0 -+DHCP_BINARY_AGE=0 -+DHCP_VERSION_SUFFIX= -+DHCP_VERSION=$DHCP_MAJOR_VERSION.$DHCP_MINOR_VERSION.$DHCP_MICRO_VERSION$DHCP_VERSION_SUFFIX -+ -+LT_RELEASE=$DHCP_MAJOR_VERSION.$DHCP_MINOR_VERSION -+LT_CURRENT=`expr $DHCP_MICRO_VERSION - $DHCP_INTERFACE_AGE` -+LT_REVISION=$DHCP_INTERFACE_AGE -+AC_SUBST(DHCP_VERSION) -+AC_SUBST(LT_RELEASE) -+AC_SUBST(LT_CURRENT) -+AC_SUBST(LT_REVISION) -+AC_SUBST(LT_AGE) -+ - # we specify "foreign" to avoid having to have the GNU mandated files, - # like AUTHORS, COPYING, and such - AM_INIT_AUTOMAKE([foreign]) -@@ -20,7 +47,8 @@ if test "$GCC" = "yes"; then - fi - fi - --AC_PROG_RANLIB -+AC_PROG_LIBTOOL -+ - AC_CONFIG_HEADERS([includes/config.h]) - - # we sometimes need to know byte order for building packets -diff -up dhcp-4.0.0//dst/Makefile.am.libdhcp4client dhcp-4.0.0//dst/Makefile.am ---- dhcp-4.0.0//dst/Makefile.am.libdhcp4client 2008-08-01 10:17:45.000000000 -1000 -+++ dhcp-4.0.0//dst/Makefile.am 2008-08-01 10:17:46.000000000 -1000 -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 - - lib_LIBRARIES = libdst.a - --noinst_LIBRARIES = libdstnomd5.a -+noinst_LIBRARIES = libdstnomd5.a libdstLIBDHCP.a - - libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ - base64.c prandom.c -@@ -10,4 +10,8 @@ libdst_a_SOURCES = dst_support.c dst_api - libdstnomd5_a_SOURCES = dst_support.c dst_api.c hmac_link.c \ - base64.c prandom.c - -+libdstLIBDHCP_a_CFLAGS = -DLIBDHCP -+libdstLIBDHCP_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ -+ base64.c prandom.c -+ - EXTRA_DIST = dst_internal.h md5.h md5_locl.h -diff -up dhcp-4.0.0//dst/hmac_link.c.libdhcp4client dhcp-4.0.0//dst/hmac_link.c ---- dhcp-4.0.0//dst/hmac_link.c.libdhcp4client 2007-12-05 14:50:22.000000000 -1000 -+++ dhcp-4.0.0//dst/hmac_link.c 2008-08-01 10:17:46.000000000 -1000 -@@ -39,6 +39,10 @@ static const char rcsid[] = "$Header: /p - - #include "dst_internal.h" - -+#ifdef LIBDHCP -+extern void* dmalloc(size_t,char *,int); -+#endif -+ - #ifdef USE_MD5 - # include "md5.h" - # ifndef _MD5_H_ -@@ -87,7 +91,11 @@ dst_hmac_md5_sign(const int mode, DST_KE - MD5_CTX *ctx = NULL; - - if (mode & SIG_MODE_INIT) -+#ifdef LIBDHCP -+ ctx = (MD5_CTX *) dmalloc(sizeof(*ctx),__FILE__,__LINE__); -+#else - ctx = (MD5_CTX *) malloc(sizeof(*ctx)); -+#endif - else if (context) - ctx = (MD5_CTX *) *context; - if (ctx == NULL) -@@ -154,7 +162,11 @@ dst_hmac_md5_verify(const int mode, DST_ - MD5_CTX *ctx = NULL; - - if (mode & SIG_MODE_INIT) -+#ifdef LIBDHCP -+ ctx = (MD5_CTX *) dmalloc(sizeof(*ctx),__FILE__,__LINE__); -+#else - ctx = (MD5_CTX *) malloc(sizeof(*ctx)); -+#endif - else if (context) - ctx = (MD5_CTX *) *context; - if (ctx == NULL) -@@ -218,8 +230,11 @@ dst_buffer_to_hmac_md5(DST_KEY *dkey, co - - if (dkey == NULL || key == NULL || keylen < 0) - return (-1); -- -+#ifdef LIBDHCP -+ if ((hkey = (HMAC_Key *) dmalloc(sizeof(HMAC_Key),__FILE__,__LINE__)) == NULL) -+#else - if ((hkey = (HMAC_Key *) malloc(sizeof(HMAC_Key))) == NULL) -+#endif - return (-2); - - memset(hkey->hk_ipad, 0, sizeof(hkey->hk_ipad)); -@@ -348,7 +363,11 @@ dst_hmac_md5_key_from_file_format(DST_KE - if (eol == NULL) - return (-4); - len = eol - p; -+#ifdef LIBDHCP -+ tmp = dmalloc(len + 2,__FILE__,__LINE__); -+#else - tmp = malloc(len + 2); -+#endif - memcpy(tmp, p, len); - *(tmp + len) = 0x0; - key_len = b64_pton((char *)tmp, key, HMAC_LEN+1); /* see above */ -@@ -440,8 +459,11 @@ dst_hmac_md5_generate_key(DST_KEY *key, - return(0); - - len = size > 64 ? 64 : size; -+#ifdef LIBDHCP -+ buff = dmalloc(len+8,__FILE__,__LINE__); -+#else - buff = malloc(len+8); -- -+#endif - n = dst_random(DST_RAND_SEMI, len, buff); - n += dst_random(DST_RAND_KEY, len, buff); - if (n <= len) { /* failed getting anything */ -@@ -464,7 +486,11 @@ dst_hmac_md5_init() - { - if (dst_t_func[KEY_HMAC_MD5] != NULL) - return (1); -+#ifdef LIBDHCP -+ dst_t_func[KEY_HMAC_MD5] = dmalloc(sizeof(struct dst_func),__FILE__,__LINE__); -+#else - dst_t_func[KEY_HMAC_MD5] = malloc(sizeof(struct dst_func)); -+#endif - if (dst_t_func[KEY_HMAC_MD5] == NULL) - return (0); - memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func)); -diff -up dhcp-4.0.0//includes/dhcpd.h.libdhcp4client dhcp-4.0.0//includes/dhcpd.h ---- dhcp-4.0.0//includes/dhcpd.h.libdhcp4client 2008-08-01 10:17:46.000000000 -1000 -+++ dhcp-4.0.0//includes/dhcpd.h 2008-08-01 10:17:46.000000000 -1000 -@@ -1199,14 +1199,6 @@ struct hardware_link { - - typedef void (*tvref_t)(void *, void *, const char *, int); - typedef void (*tvunref_t)(void *, const char *, int); --struct timeout { -- struct timeout *next; -- TIME when; -- void (*func) PROTO ((void *)); -- void *what; -- tvref_t ref; -- tvunref_t unref; --}; - - struct protocol { - struct protocol *next; -@@ -1664,7 +1656,6 @@ extern const char *path_dhcpd_pid; - - extern int dhcp_max_agent_option_packet_length; - --int main(int, char **); - void postconf_initialization(int); - void postdb_startup(void); - void cleanup PROTO ((void)); -@@ -2337,7 +2328,6 @@ extern void (*bootp_packet_handler) PROT - extern void (*dhcpv6_packet_handler)(struct interface_info *, - const char *, int, - int, const struct iaddr *, isc_boolean_t); --extern struct timeout *timeouts; - extern omapi_object_type_t *dhcp_type_interface; - #if defined (TRACING) - extern trace_type_t *interface_trace; -@@ -2392,6 +2382,10 @@ extern struct universe dhcpv6_universe; - extern struct universe nwip_universe; - extern struct universe fqdn_universe; - extern struct universe vsio_universe; -+extern struct universe vendor_class_universe; -+extern struct universe vendor_universe; -+extern struct universe isc_universe; -+extern struct universe isc6_universe; - extern int dhcp_option_default_priority_list []; - extern int dhcp_option_default_priority_list_count; - extern const char *hardware_types [256]; -diff -up dhcp-4.0.0//omapip/Makefile.am.libdhcp4client dhcp-4.0.0//omapip/Makefile.am ---- dhcp-4.0.0//omapip/Makefile.am.libdhcp4client 2007-05-29 06:32:11.000000000 -1000 -+++ dhcp-4.0.0//omapip/Makefile.am 2008-08-01 10:17:46.000000000 -1000 -@@ -1,10 +1,18 @@ - lib_LIBRARIES = libomapi.a -+noinst_LIBRARIES = libomapiLIBDHCP.a - noinst_PROGRAMS = svtest - - libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ - errwarn.c listener.c dispatch.c generic.c support.c \ - handle.c message.c convert.c hash.c auth.c inet_addr.c \ - array.c trace.c mrtrace.c toisc.c iscprint.c -+ -+libomapiLIBDHCP_a_CFLAGS = -DLIBDHCP -+libomapiLIBDHCP_a_SOURCES = alloc.c array.c auth.c buffer.c connection.c \ -+ convert.c dispatch.c errwarn.c handle.c hash.c listener.c \ -+ mrtrace.c result.c support.c toisc.c trace.c generic.c message.c \ -+ protocol.c -+ - man_MANS = omapi.3 - EXTRA_DIST = $(man_MANS) - -diff -up dhcp-4.0.0//omapip/alloc.c.libdhcp4client dhcp-4.0.0//omapip/alloc.c ---- dhcp-4.0.0//omapip/alloc.c.libdhcp4client 2007-07-12 20:43:42.000000000 -1000 -+++ dhcp-4.0.0//omapip/alloc.c 2008-08-01 10:17:46.000000000 -1000 -@@ -37,6 +37,33 @@ - - #include - -+#ifdef LIBDHCP -+/* OK, we need a quick and dirty way of freeing all memory used by libdhcp. -+ All pointers will be stored in a glibc tree on alloc, and removed on free. -+ This is not too expensive for light single-call library use. -+*/ -+#include -+extern void tdestroy (void *root, void (*free_node)(void *nodep)); -+static void *all_pointers=0L; -+static int ptr_comparator(const void *p1, const void *p2) { -+ return ((p1 == p2) ? 0 : ((p1 > p2) ? 1 : -1)); -+} -+ -+static void record_pointer(void *ptr) { -+ tsearch(ptr, &(all_pointers), ptr_comparator); -+} -+ -+static void forget_pointer(void *ptr) { -+ tdelete(ptr, &(all_pointers), ptr_comparator); -+} -+ -+void omapi_free_all_pointers(void) { -+ if (all_pointers != NULL) -+ tdestroy(all_pointers, free); -+ all_pointers = NULL; -+} -+#endif -+ - #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ - defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT) - struct dmalloc_preamble *dmalloc_list; -@@ -72,7 +99,9 @@ dmalloc(unsigned size, const char *file, - return NULL; - - foo = malloc(len); -- -+#ifdef LIBDHCP -+ record_pointer(foo); -+#endif - if (!foo) - return NULL; - bar = (void *)(foo + DMDOFFSET); -@@ -191,6 +220,9 @@ dfree(void *ptr, const char *file, int l - 0, (unsigned char *)ptr + DMDOFFSET, 0, 1, RC_MALLOC); - #endif - free (ptr); -+#ifdef LIBDHCP -+ forget_pointer(ptr); -+#endif - } - - #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ -diff -up dhcp-4.0.0//omapip/dispatch.c.libdhcp4client dhcp-4.0.0//omapip/dispatch.c ---- dhcp-4.0.0//omapip/dispatch.c.libdhcp4client 2007-11-30 11:51:43.000000000 -1000 -+++ dhcp-4.0.0//omapip/dispatch.c 2008-08-01 10:17:46.000000000 -1000 -@@ -37,7 +37,7 @@ - #include - #include - --static omapi_io_object_t omapi_io_states; -+omapi_io_object_t omapi_io_states; - time_t cur_time; - - OMAPI_OBJECT_ALLOC (omapi_io, -diff -up dhcp-4.0.0//omapip/errwarn.c.libdhcp4client dhcp-4.0.0//omapip/errwarn.c ---- dhcp-4.0.0//omapip/errwarn.c.libdhcp4client 2008-08-01 10:17:44.000000000 -1000 -+++ dhcp-4.0.0//omapip/errwarn.c 2008-08-01 10:17:46.000000000 -1000 -@@ -37,6 +37,11 @@ - #include - #include - -+#ifdef LIBDHCP -+#include -+extern LIBDHCP_Control *libdhcp_control; -+#endif -+ - #ifdef DEBUG - int log_perror = -1; - #else -@@ -46,7 +51,9 @@ int log_priority; - void (*log_cleanup) (void); - - #define CVT_BUF_MAX 1023 -+#ifndef LIBDHCP - static char mbuf [CVT_BUF_MAX + 1]; -+#endif - static char fbuf [CVT_BUF_MAX + 1]; - - /* Log an error message, then exit... */ -@@ -56,6 +63,16 @@ void log_fatal (const char * fmt, ... ) - va_list list; - - do_percentm (fbuf, fmt); -+ -+#ifdef LIBDHCP -+ if (libdhcp_control && (libdhcp_control->eh)) { -+ va_start (list, fmt); -+ libdhcp_control->eh(libdhcp_control, LOG_FATAL, fbuf, list); -+ va_end(list); -+ libdhcp_control->finished = 1; -+ return; -+ } -+#else - - /* %Audit% This is log output. %2004.06.17,Safe% - * If we truncate we hope the user can get a hint from the log. -@@ -89,6 +106,7 @@ void log_fatal (const char * fmt, ... ) - if (log_cleanup) - (*log_cleanup) (); - exit (1); -+#endif - } - - /* Log an error message... */ -@@ -99,6 +117,13 @@ int log_error (const char * fmt, ...) - - do_percentm (fbuf, fmt); - -+#ifdef LIBDHCP -+ if (libdhcp_control && libdhcp_control->eh) { -+ va_start (list, fmt); -+ libdhcp_control->eh(libdhcp_control, LOG_ERR, fbuf, list); -+ va_end(list); -+ } -+#else - /* %Audit% This is log output. %2004.06.17,Safe% - * If we truncate we hope the user can get a hint from the log. - */ -@@ -114,7 +139,7 @@ int log_error (const char * fmt, ...) - write (STDERR_FILENO, mbuf, strlen (mbuf)); - write (STDERR_FILENO, "\n", 1); - } -- -+#endif - return 0; - } - -@@ -126,6 +151,13 @@ int log_info (const char *fmt, ...) - - do_percentm (fbuf, fmt); - -+#ifdef LIBDHCP -+ if (libdhcp_control && libdhcp_control->eh) { -+ va_start (list, fmt); -+ libdhcp_control->eh(libdhcp_control, LOG_INFO, fbuf, list); -+ va_end(list); -+ } -+#else - /* %Audit% This is log output. %2004.06.17,Safe% - * If we truncate we hope the user can get a hint from the log. - */ -@@ -141,7 +173,7 @@ int log_info (const char *fmt, ...) - write (STDERR_FILENO, mbuf, strlen (mbuf)); - write (STDERR_FILENO, "\n", 1); - } -- -+#endif - return 0; - } - -@@ -152,7 +184,13 @@ int log_debug (const char *fmt, ...) - va_list list; - - do_percentm (fbuf, fmt); -- -+#ifdef LIBDHCP -+ if (libdhcp_control && libdhcp_control->eh) { -+ va_start (list, fmt); -+ libdhcp_control->eh(libdhcp_control, LOG_DEBUG, fbuf, list); -+ va_end(list); -+ } -+#else - /* %Audit% This is log output. %2004.06.17,Safe% - * If we truncate we hope the user can get a hint from the log. - */ -@@ -168,7 +206,7 @@ int log_debug (const char *fmt, ...) - write (STDERR_FILENO, mbuf, strlen (mbuf)); - write (STDERR_FILENO, "\n", 1); - } -- -+#endif - return 0; - } - diff --git a/dhcp.spec b/dhcp.spec index 2dc27c1..ebf9944 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,10 +1,23 @@ # vendor string (e.g., Fedora, EL) %define vvendor Fedora +# Make it easy for package rebuilders to select LPF or sockets +%define netmethod USE_LPF + +%define with_USE_SOCKETS %{?_with_USE_SOCKETS: 1} %{?!_with_USE_SOCKETS: 0} +%if %{with_USE_SOCKETS} +%define netmethod USE_SOCKETS +%endif + +%define with_USE_LPF %{?_with_USE_LPF: 1} %{?!_with_USE_LPF: 0} +%if %{with_USE_LPF} +%define netmethod USE_LPF +%endif + Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 4.0.0 -Release: 31%{?dist} +Release: 32%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -16,15 +29,12 @@ URL: http://isc.org/products/DHCP/ Source0: ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz Source1: dhcpd.init Source2: dhcrelay.init -Source3: libdhcp4client.pc -Source5: README.ldap -Source6: draft-ietf-dhc-ldap-schema-01.txt -Source7: dhcpd-conf-to-ldap +Source3: README.ldap +Source4: draft-ietf-dhc-ldap-schema-01.txt +Source5: dhcpd-conf-to-ldap Source8: dhclient-script -Source9: dhcp4client.h -Source10: libdhcp_control.h -Source11: dhcp.schema -Source12: get-ldap-patch.sh +Source9: dhcp.schema +Source10: get-ldap-patch.sh Patch0: %{name}-4.0.0-errwarn-message.patch Patch1: %{name}-4.0.0-ldap-configuration.patch @@ -44,11 +54,10 @@ Patch14: %{name}-4.0.0-manpages.patch Patch15: %{name}-4.0.0-paths.patch Patch16: %{name}-4.0.0-NetworkManager-crash.patch Patch17: %{name}-4.0.0-CLOEXEC.patch -Patch18: %{name}-4.0.0-libdhcp4client.patch -Patch19: %{name}-4.0.0-inherit-leases.patch -Patch20: %{name}-4.0.0-garbage-chars.patch -Patch21: %{name}-4.0.0-port-validation.patch -Patch22: %{name}-4.0.0-invalid-dhclient-conf.patch +Patch18: %{name}-4.0.0-inherit-leases.patch +Patch19: %{name}-4.0.0-garbage-chars.patch +Patch20: %{name}-4.0.0-port-validation.patch +Patch21: %{name}-4.0.0-invalid-dhclient-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf @@ -101,29 +110,17 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Header files and API documentation for using the ISC DHCP libraries. The libdhcpctl and libomapi static libraries are also included in this package. -%package -n libdhcp4client -Summary: ISC DHCP IPv4 client in a library for invocation from other programs -Group: Development/Libraries - -%description -n libdhcp4client -The Internet Software Consortium (ISC) Dynamic Host Configuration Protocol -(DHCP) Internet Protocol version 4 (IPv4) client software in a library -suitable for linkage with and invocation by other programs. - -%package -n libdhcp4client-devel -Summary: Header files for development with the ISC DHCP IPv4 client library -Group: Development/Libraries -Requires: dhcp-devel = %{epoch}:%{version}-%{release} -Requires: libdhcp4client = %{epoch}:%{version}-%{release} -Requires: openldap-devel -Requires: pkgconfig - -%description -n libdhcp4client-devel -Header files for development with the Internet Software Consortium (ISC) -Dynamic Host Configuration Protocol (DHCP) Internet Protocol version 4 (IPv4) -client library. - %prep +case "%{netmethod}" in + USE_LPF|USE_SOCKETS) + continue ;; + *) + echo >&2 + echo "ERROR: Only --with options supported: USE_LPF, USE_SOCKETS" >&2 + echo >&2 + exit 1 ;; +esac + %setup -q # Replace the standard ISC warning message about requesting help with an @@ -196,36 +193,27 @@ client library. # Make sure all open file descriptors are closed-on-exec for SELinux (#446632) %patch17 -p1 -# Add the libdhcp4client target (library version of dhclient) -%patch18 -p1 - # If we have an active lease, do not down the interface (#453982) -%patch19 -p1 +%patch18 -p1 # Fix 'garbage in format string' error (#450052) -%patch20 -p1 +%patch19 -p1 # Validate port numbers specified for dhclient, dhcpd, and dhcrelay # to make sure they are within 1-65535, inclusive. (#438149) -%patch21 -p1 +%patch20 -p1 # The sample dhclient.conf should say 'supersede domain-search' (#467955) -%patch22 -p1 +%patch21 -p1 # Copy in documentation and example scripts for LDAP patch to dhcpd -%{__install} -p -m 0644 %{SOURCE5} . -%{__install} -p -m 0644 %{SOURCE6} doc/ -%{__install} -p -m 0755 %{SOURCE7} contrib/ +%{__install} -p -m 0644 %{SOURCE3} . +%{__install} -p -m 0644 %{SOURCE4} doc/ +%{__install} -p -m 0755 %{SOURCE5} contrib/ # Copy in the Fedora/RHEL dhclient script %{__install} -p -m 0755 %{SOURCE8} client/scripts/linux -# Copy in the libdhcp4client headers and Makefile.dist -%{__install} -p -m 0644 %{SOURCE9} includes/ - -# Copy in libdhcp_control.h to the isc-dhcp includes directory -%{__install} -p -m 0644 %{SOURCE10} includes/isc-dhcp/ - # Ensure we don't pick up Perl as a dependency from the scripts and modules # in the contrib directory (we copy this to /usr/share/doc in the final # package). @@ -278,7 +266,7 @@ autoheader automake --foreign --add-missing --copy %build -CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE" \ +CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE -DUSE_SSL=1 -D%{netmethod}=1" \ %configure \ --disable-dhcpv6 \ --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \ @@ -288,15 +276,11 @@ CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE" \ --with-relay-pid-file=%{_localstatedir}/run/dhcrelay.pid %{__make} %{?_smp_mflags} -%{__sed} 's/@DHCP_VERSION@/%{version}/' < %{SOURCE3} > libdhcp4client.pc - %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} # Remove files we don't want -%{__rm} -rf %{buildroot}%{_libdir}/libdhcp4client.a -%{__rm} -rf %{buildroot}%{_libdir}/libdhcp4client.la %{__rm} %{buildroot}%{_sysconfdir}/dhclient.conf # Install correct dhclient-script @@ -304,19 +288,6 @@ CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE" \ %{__mv} %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient %{__install} -p -m 0755 client/scripts/linux %{buildroot}/sbin/dhclient-script -# Install pkg-config file -%{__install} -p -m 0644 %{SOURCE10} %{buildroot}%{_includedir}/isc-dhcp/ -%{__install} -p -m 0644 -D libdhcp4client.pc %{buildroot}%{_libdir}/pkgconfig/libdhcp4client.pc - -# Install headers for libdhcp4client-devel -%{__mkdir} -p %{buildroot}%{_includedir}/dhcp4client/minires -%{__install} -p -m 0644 %{SOURCE9} %{buildroot}%{_includedir}/dhcp4client -for hdr in cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \ - heap.h inet.h minires/minires.h minires/res_update.h \ - minires/resolv.h osdep.h site.h statement.h tree.h ; do - %{__install} -p -m 0644 includes/${hdr} %{buildroot}%{_includedir}/dhcp4client/${hdr} -done - # Install init scripts %{__mkdir} -p %{buildroot}%{_initrddir} %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/dhcpd @@ -356,7 +327,7 @@ EOF # Install dhcp.schema for LDAP configuration %{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema -%{__install} -p -m 0644 -D %{SOURCE11} %{buildroot}%{_sysconfdir}/openldap/schema +%{__install} -p -m 0644 -D %{SOURCE9} %{buildroot}%{_sysconfdir}/openldap/schema %clean %{__rm} -rf %{buildroot} @@ -387,10 +358,6 @@ if [ $1 -ge 1 ]; then /sbin/service dhcrelay condrestart >/dev/null 2>&1 || : fi -%post -n libdhcp4client -p /sbin/ldconfig - -%postun -n libdhcp4client -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc LICENSE README README.ldap RELNOTES dhcpd.conf.sample @@ -438,17 +405,12 @@ fi %attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz -%files -n libdhcp4client -%defattr(0755,root,root,0755) -%{_libdir}/libdhcp4client-*.*.so.* - -%files -n libdhcp4client-devel -%defattr(0644,root,root,0755) -%{_includedir}/dhcp4client -%{_libdir}/pkgconfig/libdhcp4client.pc -%{_libdir}/libdhcp4client.so - %changelog +* Wed Dec 03 2008 David Cantrell - 12:4.0.0-32 +- Enable LDAP/SSL support in dhcpd (#467740) +- Do not calculate a prefix for an address we did not receive (#473885) +- Removed libdhcp4client because libdhcp has been removed from Fedora + * Wed Oct 29 2008 David Cantrell - 12:4.0.0-31 - Use O_CLOEXEC in open(2) calls and "e" mode in fopen(3) calls, build with -D_GNU_SOURCE so we pick up O_CLOEXEC (#468984) diff --git a/dhcp4client.h b/dhcp4client.h deleted file mode 100644 index 80f83a8..0000000 --- a/dhcp4client.h +++ /dev/null @@ -1,30 +0,0 @@ -/* dhcp4client.h - * - * Interface to the ISC dhcp IPv4 client libdhcp4client library. - * - * Copyright (C) 2006 Red Hat, Inc. All rights reserved. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions of - * the GNU General Public License v.2, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY expressed or implied, including the implied warranties of - * MERCHANTABILITY or FITNESS FOR A * PARTICULAR PURPOSE. See the GNU General - * Public License for more details. You should have received a copy of the - * GNU General Public License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. Any Red Hat trademarks that are incorporated in the - * source code or documentation are not subject to the GNU General Public - * License and may only be used or replicated with the express permission of - * Red Hat, Inc. - * - * Red Hat Author(s): Jason Vas Dias - * David Cantrell - */ - -/* include libdhcp_control.h or libdhcp.h for this */ -extern struct libdhcp_control_s; - -/* The ISC IPv4 DHCP client main() function */ -extern int dhcpv4_client(struct libdhcp_control_s *dhc_ctl, - int argc, char **argv, char **envp); diff --git a/libdhcp4client.pc b/libdhcp4client.pc deleted file mode 100644 index 8be7273..0000000 --- a/libdhcp4client.pc +++ /dev/null @@ -1,5 +0,0 @@ -Name: libdhcp4client -Description: ISC DHCP IPv4 client library -Version: @DHCP_VERSION@ -Libs: -ldhcp4client -Cflags: -I/usr/include/dhcp4client diff --git a/libdhcp_control.h b/libdhcp_control.h deleted file mode 100644 index 7eacc22..0000000 --- a/libdhcp_control.h +++ /dev/null @@ -1,132 +0,0 @@ -/* libdhcp_control.h - * - * DHCP client control API for libdhcp, a minimal interface to the - * ISC dhcp IPv4 client libdhcp4client library, - * and to the dhcpv6 DHCPv6 client libdhcp6client library. - * - * Each DHCP client library must include this file to be controlled - * by libdhcp. - * - * Copyright (C) 2006 Red Hat, Inc. All rights reserved. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions of - * the GNU General Public License v.2, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY expressed or implied, including the implied warranties of - * MERCHANTABILITY or FITNESS FOR A * PARTICULAR PURPOSE. See the GNU General - * Public License for more details. You should have received a copy of the - * GNU General Public License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. Any Red Hat trademarks that are incorporated in the - * source code or documentation are not subject to the GNU General Public - * License and may only be used or replicated with the express permission of - * Red Hat, Inc. - * - * Red Hat Author(s): Jason Vas Dias - * David Cantrell - */ - -#ifndef LIBDHCP_CONTROL_H -#define LIBDHCP_CONTROL_H - -#include -#include - -#define LOG_FATAL 8 - -typedef enum dhcp_state_e { - /* DHCPv4 client states - * third callback arg will be a 'struct client_state *' - */ - DHC4_NBI, /* failed: no broadcast interfaces found */ - DHC4_PREINIT, /* configuration started - bring the interface "UP" */ - DHC4_BOUND, /* lease obtained */ - DHC4_RENEW, /* lease renewed */ - DHC4_REBOOT, /* have valid lease, but now obtained a different one */ - DHC4_REBIND, /* new, different lease */ - DHC4_STOP, /* remove old lease */ - DHC4_MEDIUM, /* media selection begun */ - DHC4_TIMEOUT, /* timed out contacting DHCP server */ - DHC4_FAIL, /* all attempts to contact server timed out, sleeping */ - DHC4_EXPIRE, /* lease has expired, renewing */ - DHC4_RELEASE, /* releasing lease */ - - /* This state raised by both clients: */ - DHC_TIMEDOUT, /* libdhcp_control timeout has been exceeded */ - - /* DHCPv6 client states: */ - DHC6_BOUND, /* new lease obtained - arg is optinfo * */ - DHC6_REBIND, /* existing expired lease rebound - arg is optinfo * */ - DHC6_RELEASE /* existing lease expired - arg is dhcp6_iaidaddr*/ -} DHCP_State; - -struct libdhcp_control_s; - -/* ala syslog(3): LOG_EMERG=0 - LOG_DEBUG=7 (+ LOG_FATAL=8 : finished -> 1) */ -typedef int (*LIBDHCP_Error_Handler) (struct libdhcp_control_s *ctl, - int priority, const char *fmt, - va_list ap); - -/* The DHCP clients will call the users' callback on important state change - * events, with the second arg set to the client DHCP_State, and the third - * arg set to a client specific pointer as described below. */ -typedef int (*LIBDHCP_Callback) (struct libdhcp_control_s *control, - enum dhcp_state_e, void*); - -typedef struct libdhcp_control_s { - /* the DHCP clients' main loop calls this on state changes */ - LIBDHCP_Callback callback; - - /* LIBDHCP_Capability bits to enable */ - uint16_t capability; - - /* set to one to make clients exit their main loop */ - uint8_t finished; - - /* set to one to decline the lease (DHCPv4 only) */ - uint8_t decline; - - /* (timeout+now) == time after which clients MUST return */ - time_t timeout; - - /* clients set this to time(0) on entering main loop */ - time_t now; - - /* user data pointer */ - void *arg; - LIBDHCP_Error_Handler eh; -} LIBDHCP_Control; - -/* DHCP client "capabilities" */ -typedef enum libdhcp_capability_e { - /* use / do not use persistent lease database files */ - DHCP_USE_LEASE_DATABASE = 1, - - /* use / do not use pid file */ - DHCP_USE_PID_FILE = 2, - - /* - * DHCPv6 supports these capabilities in process, - * while the DHCPv4 client will fork and exec the dhclient-script to - * implement them if these bits are set - otherwise, if no bits are set, - * the callback is called and the script is not run. - */ - /* configure interfaces UP/DOWN as required */ - DHCP_CONFIGURE_INTERFACES = 4, - - /* configure interface addresses as required */ - DHCP_CONFIGURE_ADDRESSES = 8, - - /* configure routes as required */ - DHCP_CONFIGURE_ROUTES = 16, - - /* configure resolv.conf as required */ - DHCP_CONFIGURE_RESOLVER = 32, - - /* DHCPv6 only: */ - /* configure radvd.conf & restart radvd as required */ - DHCP_CONFIGURE_RADVD = 64, -} LIBDHCP_Capability; - -#endif