summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2013-12-03 00:23:41 +0000
committerJelmer Vernooij <jelmer@samba.org>2013-12-04 00:20:48 +0000
commit55f984d7b3f03bcaafa9b2d0967389acc6aefa80 (patch)
treebc846136bc736f30971cc4d509e668b999ebf1a2 /debian/patches
parentef02b1dadd43300f612941dca3cc71d0604680ad (diff)
downloadsamba-55f984d7b3f03bcaafa9b2d0967389acc6aefa80.tar.gz
Cherry-pick fix for heim_octet_t.
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/26_heimdal_no_local_krb5_types14
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/patches/26_heimdal_no_local_krb5_types b/debian/patches/26_heimdal_no_local_krb5_types
index adce164eae..14d2d1a5b6 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;