[Pkg-samba-maint] [samba] 19/20: Cherry-pick fix for heim_octet_t.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch samba_4.1
in repository samba.

commit 55f984d7b3f03bcaafa9b2d0967389acc6aefa80
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 3 00:23:41 2013 +0000

    Cherry-pick fix for heim_octet_t.
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
---
 debian/patches/26_heimdal_no_local_krb5_types | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/debian/patches/26_heimdal_no_local_krb5_types b/debian/patches/26_heimdal_no_local_krb5_types
index adce164..14d2d1a 100644
--- a/debian/patches/26_heimdal_no_local_krb5_types
+++ b/debian/patches/26_heimdal_no_local_krb5_types
@@ -31,3 +31,17 @@ index 568386d..9135df8 100644
  	.prefix = "samba4",
  	.create = hdb_samba4_create
  };
+diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
+index 83fb2bd..9020da7 100644
+--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
++++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
+@@ -972,8 +972,7 @@ static WERROR create_req(TALLOC_CTX *ctx, hx509_context *hctx, hx509_request *re
+ /* Return an error when we fail to generate a certificate */
+ 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;

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