[bind-dyndb-ldap/f17] Fixed bad patch

[Tomas Hozza]

commit f737cac2fb0bbd03a1951936155c9ba3c3d429d3
Author: Tomas Hozza <thozza at redhat.com>
Date:   Mon Jun 3 16:58:18 2013 +0200

    Fixed bad patch
    
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 bind-dyndb-ldap-build-fixes.patch |   37 ++++++++++---------------------------
 1 files changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/bind-dyndb-ldap-build-fixes.patch b/bind-dyndb-ldap-build-fixes.patch
index 726adab..46aa920 100644
--- a/bind-dyndb-ldap-build-fixes.patch
+++ b/bind-dyndb-ldap-build-fixes.patch
@@ -1,20 +1,7 @@
-From 4374791563602f026b870b0c37979506f02683ae Mon Sep 17 00:00:00 2001
-From: Tomas Babej <tbabej at redhat.com>
-Date: Mon, 6 May 2013 07:23:08 -0400
-Subject: [PATCH] Build fixes for Fedora 19
-
-This patch contains various (gcc-related) fixes to make build
-on F19 possible.
----
- src/acl.c         | 4 ++--
- src/ldap_helper.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/acl.c b/src/acl.c
-index 754cd53dc3d31b99d0954836feafbd46747c48c2..2d4f54db89c73b7e9387f21bbd94eedc364c152b 100644
---- a/src/acl.c
-+++ b/src/acl.c
-@@ -179,7 +179,7 @@ parse(cfg_parser_t *parser, const char *string, cfg_type_t **type,
+diff -up bind-dyndb-ldap-2.5/src/acl.c.build_fix bind-dyndb-ldap-2.5/src/acl.c
+--- bind-dyndb-ldap-2.5/src/acl.c.build_fix	2013-01-23 09:46:01.000000000 +0100
++++ bind-dyndb-ldap-2.5/src/acl.c	2013-06-03 16:57:02.626112994 +0200
+@@ -159,7 +159,7 @@ parse(cfg_parser_t *parser, const char *
  	RUNTIME_CHECK(isc_once_do(&once, init_cfgtypes) == ISC_R_SUCCESS);
  
  	string_len = strlen(string);
@@ -23,20 +10,19 @@ index 754cd53dc3d31b99d0954836feafbd46747c48c2..2d4f54db89c73b7e9387f21bbd94eedc
  	isc_buffer_add(&buffer, string_len);
  
  	result = cfg_parse_buffer(parser, &buffer, *type, &ret);
-@@ -296,7 +296,7 @@ get_fixed_name(const cfg_obj_t *obj, const char *name, dns_fixedname_t *fname)
+@@ -249,7 +249,7 @@ get_fixed_name(const cfg_obj_t *obj, con
+ 	obj = cfg_tuple_get(obj, name);
  	str = cfg_obj_asstring(obj);
- 
  	len = strlen(str);
 -	isc_buffer_init(&buf, str, len);
 +	isc_buffer_init(&buf, (char *)str, len);
  
  	/*
  	 * Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=728925
-diff --git a/src/ldap_helper.c b/src/ldap_helper.c
-index 037629f3e50fdba2c17c1a180736ed3b64169aae..eda17fa8fed63e43d702c7ad9984b176e0b27065 100644
---- a/src/ldap_helper.c
-+++ b/src/ldap_helper.c
-@@ -2037,7 +2037,7 @@ parse_rdata(isc_mem_t *mctx, ldap_qresult_t *qresult,
+diff -up bind-dyndb-ldap-2.5/src/ldap_helper.c.build_fix bind-dyndb-ldap-2.5/src/ldap_helper.c
+--- bind-dyndb-ldap-2.5/src/ldap_helper.c.build_fix	2013-01-23 09:46:01.000000000 +0100
++++ bind-dyndb-ldap-2.5/src/ldap_helper.c	2013-06-03 16:55:04.849806522 +0200
+@@ -1908,7 +1908,7 @@ parse_rdata(isc_mem_t *mctx, ldap_qresul
  	text.base = rdata_text;
  	text.length = strlen(text.base);
  
@@ -45,6 +31,3 @@ index 037629f3e50fdba2c17c1a180736ed3b64169aae..eda17fa8fed63e43d702c7ad9984b176
  	isc_buffer_add(&lex_buffer, text.length);
  	isc_buffer_setactive(&lex_buffer, text.length);
  
--- 
-1.8.1.4
-