[Pkg-samba-maint] [samba] 03/03: Remove the part of patch 26_heimdal_compat integrated upstream.

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit 06153451f864b9bf39a56dd9f88aeb8d2b8b6bbd
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sat Feb 22 22:33:39 2014 +0100

    Remove the part of patch 26_heimdal_compat integrated upstream.
---
 debian/changelog                 |  1 +
 debian/patches/26_heimdal_compat | 36 ------------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a790bfd..acfb9bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ samba (2:4.1.5+dfsg-1) UNRELEASED; urgency=medium
 
   [ Ivo De Decker ]
   * New upstream release.
+  * Remove the part of patch 26_heimdal_compat integrated upstream.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 02 Feb 2014 14:22:17 +0000
 
diff --git a/debian/patches/26_heimdal_compat b/debian/patches/26_heimdal_compat
index 9c72d6b..e538ba4 100644
--- a/debian/patches/26_heimdal_compat
+++ b/debian/patches/26_heimdal_compat
@@ -30,39 +30,3 @@ Index: samba-4.1.3+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c
  	WERROR w_err;
  	RSA *rsa;
  	hx509_context hctx;
-Index: samba-4.1.3+dfsg/source4/kdc/hdb-samba4-plugin.c
-===================================================================
---- samba-4.1.3+dfsg.orig/source4/kdc/hdb-samba4-plugin.c	2013-06-13 04:21:02.000000000 -0500
-+++ samba-4.1.3+dfsg/source4/kdc/hdb-samba4-plugin.c	2014-01-09 14:39:14.580300241 -0600
-@@ -70,6 +70,18 @@
- 	return EINVAL;
- }
- 
-+#if HDB_INTERFACE_VERSION >= 8
-+static krb5_error_code KRB5_LIB_CALL * hdb_samba4_init(krb5_context context, void **ctx)
-+{
-+	*ctx = NULL;
-+	return 0;
-+}
-+
-+static void KRB5_LIB_CALL * hdb_samba4_fini(void *ctx)
-+{
-+}
-+#endif
-+
- /* Only used in the hdb-backed keytab code
-  * for a keytab of 'samba4&<address>' or samba4, to find
-  * kpasswd's key in the main DB, and to
-@@ -78,7 +90,11 @@
-  * The <address> is the string form of a pointer to a talloced struct hdb_samba_context
-  */
- struct hdb_method hdb_samba4_interface = {
--	.interface_version = HDB_INTERFACE_VERSION,
-+	HDB_INTERFACE_VERSION,
-+#if HDB_INTERFACE_VERSION >= 8
-+	.init = hdb_samba4_init,
-+	.fini = hdb_samba4_fini,
-+#endif
- 	.prefix = "samba4",
- 	.create = hdb_samba4_create
- };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git