rpms/bind/devel bind-9.5-gssapictx-free.patch, NONE, 1.1 bind.spec, 1.207, 1.208 named.init, 1.57, 1.58 named.sysconfig, 1.6, 1.7 bind-9.5-spnego-memory_management.patch, 1.1, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11599

Modified Files:
	bind.spec named.init named.sysconfig 
Added Files:
	bind-9.5-gssapictx-free.patch 
Removed Files:
	bind-9.5-spnego-memory_management.patch 
Log Message:
- added new initscript option KEYTAB_FILE which specified where
  is located kerberos .keytab file for named service
- obsolete temporary bind-9.5-spnego-memory_management.patch by
  bind-9.5-gssapictx-free.patch which conforms BIND coding standards
  (#251853)


bind-9.5-gssapictx-free.patch:

--- NEW FILE bind-9.5-gssapictx-free.patch ---
Written-by: Adam Tkac <atkac redhat com>
diff -up bind-9.5.0a6/lib/dns/spnego.h.free bind-9.5.0a6/lib/dns/spnego.h
--- bind-9.5.0a6/lib/dns/spnego.h.free	2007-06-20 01:47:16.000000000 +0200
+++ bind-9.5.0a6/lib/dns/spnego.h	2007-08-22 14:32:13.000000000 +0200
@@ -67,5 +67,9 @@ OM_uint32 gss_accept_sec_context_spnego(
 					OM_uint32 *,
 					gss_cred_id_t *);
 
+/*
+ * We have to export this because we need to free memory allocated by spnego_malloc
+ */
+void spnego_free(void *ptr, const char *file, int line);
 
 #endif
diff -up bind-9.5.0a6/lib/dns/gssapictx.c.free bind-9.5.0a6/lib/dns/gssapictx.c
--- bind-9.5.0a6/lib/dns/gssapictx.c.free	2007-06-20 01:47:16.000000000 +0200
+++ bind-9.5.0a6/lib/dns/gssapictx.c	2007-08-22 14:44:46.000000000 +0200
@@ -510,7 +510,11 @@ dst_gssapi_initctx(dns_name_t *name, isc
 	RETERR(isc_buffer_copyregion(outtoken, &r));
 
 	(void)gss_release_name(&minor, &gname);
+#ifdef USE_ISC_SPNEGO
+	spnego_free (gouttoken.value, __FILE__, __LINE__);
+#else
 	(void)gss_release_buffer(&minor, &gouttoken);
+#endif
 
 	if (gret == GSS_S_COMPLETE)
 		result = ISC_R_SUCCESS;
diff -up bind-9.5.0a6/lib/dns/spnego.c.free bind-9.5.0a6/lib/dns/spnego.c
--- bind-9.5.0a6/lib/dns/spnego.c.free	2007-06-20 01:47:16.000000000 +0200
+++ bind-9.5.0a6/lib/dns/spnego.c	2007-08-22 14:32:13.000000000 +0200
@@ -201,7 +201,7 @@ spnego_malloc(size_t size, const char *f
 	return (p);
 }
 	
-static void
+void
 spnego_free(void *ptr, const char *file, int line)
 {
 	char *p = ptr;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- bind.spec	22 Aug 2007 11:01:53 -0000	1.207
+++ bind.spec	23 Aug 2007 09:09:35 -0000	1.208
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	10.%{RELEASEVER}%{?dist}
+Release: 	10.2.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,8 +64,9 @@
 Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
-Patch74:	bind-9.5-spnego-memory_management.patch
 Patch75:	bind-9.5-update.patch
+Patch76:	bind-9.5-gssapictx-free.patch
+Patch77:	bind-9.5-memory-leaks.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -246,8 +247,9 @@
 %patch72 -p1 -b .64bit
 %endif
 %patch73 -p1 -b .libidn
-%patch74 -p1 -b .memory
 %patch75 -p1 -b .update
+%patch76 -p1 -b .free
+%patch77 -p1 -b .leaks
 :;
 
 
@@ -643,6 +645,13 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Aug 22 2007 Adam Tkac <atkac redhat com> 32:9.5.0-10.2.a6
+- added new initscript option KEYTAB_FILE which specified where
+  is located kerberos .keytab file for named service
+- obsolete temporary bind-9.5-spnego-memory_management.patch by
+  bind-9.5-gssapictx-free.patch which conforms BIND coding standards
+  (#251853)
+
 * Tue Aug 21 2007 Adam Tkac <atkac redhat com> 32:9.5.0-10.a6
 - dropped direct dependency to /etc/openldap/schema directory
 - changed hardcoded paths to marcros


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- named.init	31 Jul 2007 13:28:10 -0000	1.57
+++ named.init	23 Aug 2007 09:09:35 -0000	1.58
@@ -24,6 +24,7 @@
 [ -r /etc/sysconfig/named ] && . /etc/sysconfig/named
 
 RETVAL=0
+export KRB5_KTNAME=${KEYTAB_FILE:-/etc/named.keytab}
 
 # Don't kill named during clean-up
 NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-100}


Index: named.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.sysconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- named.sysconfig	20 Jul 2007 11:31:19 -0000	1.6
+++ named.sysconfig	23 Aug 2007 09:09:35 -0000	1.7
@@ -15,3 +15,4 @@
 #			     support with the named -D option. This setting disables
 #			     this behavior.
 #
+# KEYTAB_FILE="/dir/file"    --  Specify named service keytab file (for GSS-TSIG)


--- bind-9.5-spnego-memory_management.patch DELETED ---