rpms/dhcp/devel dhcp.spec, 1.135, 1.136 dhcp-3.0.5-ldap-configuration.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27413

Modified Files:
	dhcp.spec dhcp-3.0.5-ldap-configuration.patch 
Log Message:
fix file read breakage


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- dhcp.spec	2 Feb 2007 20:41:01 -0000	1.135
+++ dhcp.spec	4 Feb 2007 18:51:19 -0000	1.136
@@ -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 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Sun Feb 04 2007 David Woodhouse <dwmw2 at redhat.com> - 12:3.0.5-15
+- Fix broken file reading due to LDAP patch
+
 * Fri Feb 02 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-14
 - Only export the symbols we want in libdhcp4client (#198496)
 

dhcp-3.0.5-ldap-configuration.patch:
 README.ldap                           |  157 ++++
 common/conflex.c                      |   46 -
 common/print.c                        |    6 
 contrib/dhcpd-conf-to-ldap.pl         |  517 +++++++++++++++
 doc/draft-ietf-dhc-ldap-schema-01.txt | 1089 ++++++++++++++++++++++++++++++++
 includes/dhcpd.h                      |   50 +
 includes/site.h                       |   10 
 server/Makefile.dist                  |    6 
 server/class.c                        |   17 
 server/confpars.c                     |   12 
 server/dhcpd.c                        |    3 
 server/ldap.c                         | 1142 ++++++++++++++++++++++++++++++++++
 server/mdb.c                          |    6 
 server/stables.c                      |   23 
 site.conf                             |    9 
 15 files changed, 3065 insertions(+), 28 deletions(-)

Index: dhcp-3.0.5-ldap-configuration.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-ldap-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.5-ldap-configuration.patch	1 Feb 2007 18:57:30 -0000	1.1
+++ dhcp-3.0.5-ldap-configuration.patch	4 Feb 2007 18:51:19 -0000	1.2
@@ -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'};