[Pkg-samba-maint] [samba] 01/01: Add 26_heimdal_compat: Fix compatibility with newer versions of Heimdal.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch master
in repository samba.

commit f417b20d4fc557ac3094d6a3edacee50fedcc028
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Nov 22 23:41:12 2013 +0000

    Add 26_heimdal_compat: Fix compatibility with newer versions of Heimdal.
---
 debian/changelog                 |  4 ++++
 debian/patches/26_heimdal_compat | 46 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cbd04b9..3ca54ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ samba (2:4.0.10+dfsg-5) UNRELEASED; urgency=low
   * Thai (Theppitak Karoonboonyanan).  Closes: #728525
   * Norwegian Bokmål (Bjørn Steensrud).  Closes: #729070
 
+  [ Jelmer Vernooij ]
+  * Add 26_heimdal_compat: Fix compatibility with newer versions of
+    Heimdal.
+
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Sat, 02 Nov 2013 11:51:28 +0100
 
 samba (2:4.0.10+dfsg-4) unstable; urgency=low
diff --git a/debian/patches/26_heimdal_compat b/debian/patches/26_heimdal_compat
new file mode 100644
index 0000000..a46a69a
--- /dev/null
+++ b/debian/patches/26_heimdal_compat
@@ -0,0 +1,46 @@
+diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h
+deleted file mode 100644
+index 4f55a80..0000000
+--- a/source4/heimdal_build/krb5-types.h
++++ /dev/null
+@@ -1,14 +0,0 @@
+-/* krb5-types.h -- this file was generated for i686-pc-linux-gnu by
+-                   $Id: bits.c,v 1.23 2005/01/05 15:22:02 lha Exp $ */
+-
+-#ifndef __krb5_types_h__
+-#define __krb5_types_h__
+-
+-#include "replace.h"
+-#include "system/network.h"
+-
+-typedef socklen_t krb5_socklen_t;
+-typedef int krb5_socket_t;
+-typedef ssize_t krb5_ssize_t;
+-
+-#endif /* __krb5_types_h__ */
+diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
+index 87799db..dac3678 100644
+--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
++++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
+@@ -972,7 +972,7 @@ static WERROR create_req(TALLOC_CTX *ctx, hx509_context *hctx, hx509_request *re
+ static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_call, struct ldb_context *ldb_ctx, const char *dn)
+ {
+ 
+-	struct heim_octet_string data;
++	heim_octet_string data;
+ 	WERROR w_err;
+ 	RSA *rsa;
+ 	hx509_context hctx;
+diff --git a/source4/kdc/hdb-samba4-plugin.c b/source4/kdc/hdb-samba4-plugin.c
+index 568386d..9135df8 100644
+--- a/source4/kdc/hdb-samba4-plugin.c
++++ b/source4/kdc/hdb-samba4-plugin.c
+@@ -78,7 +78,7 @@ static krb5_error_code hdb_samba4_create(krb5_context context, struct HDB **db,
+  * 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,
+ 	.prefix = "samba4",
+ 	.create = hdb_samba4_create
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 4a63691..737c247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 05_share_ldb_module
 07_private_lib
 25_heimdal_api_changes
+26_heimdal_compat
 bug_221618_precise-64bit-prototype.patch
 bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
 bug_601406_fix-perl-path-in-example.patch

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