diff --git a/dhcp-3.0.5-ldap-configuration.patch b/dhcp-3.0.5-ldap-configuration.patch index 6ab8733..b2ce1e5 100644 --- a/dhcp-3.0.5-ldap-configuration.patch +++ b/dhcp-3.0.5-ldap-configuration.patch @@ -4,7 +4,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; @@ -52,10 +52,10 @@ } + + -+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) { @@ -1718,7 +1718,7 @@ unsigned bufix, buflen; unsigned bufsiz; + -+ char (*read_function) (struct parse *); ++ int (*read_function) (struct parse *); }; /* Variable-length array of data. */ @@ -2552,7 +2552,7 @@ +} + + -+static char ++static int +ldap_read_function (struct parse *cfile) +{ + char *dn, eofstring[2] = {EOF, '\0'}; diff --git a/dhcp.spec b/dhcp.spec index 2733f54..c88348b 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -354,6 +354,9 @@ exit 0 %{_libdir}/libdhcp4client.so %changelog +* Sun Feb 04 2007 David Woodhouse - 12:3.0.5-15 +- Fix broken file reading due to LDAP patch + * Fri Feb 02 2007 David Cantrell - 12:3.0.5-14 - Only export the symbols we want in libdhcp4client (#198496)