[Pkg-samba-maint] [samba] 01/01: Drop duplicate patch 26_heimdal_no_local_krb5_types.

[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 15fe335957748db93ac7a4366390f5d63cd99e73
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Dec 6 23:33:08 2013 +0000

    Drop duplicate patch 26_heimdal_no_local_krb5_types.
---
 debian/patches/26_heimdal_no_local_krb5_types | 47 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 48 deletions(-)

diff --git a/debian/patches/26_heimdal_no_local_krb5_types b/debian/patches/26_heimdal_no_local_krb5_types
deleted file mode 100644
index 14d2d1a..0000000
--- a/debian/patches/26_heimdal_no_local_krb5_types
+++ /dev/null
@@ -1,47 +0,0 @@
-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/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/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;
diff --git a/debian/patches/series b/debian/patches/series
index 69d8e3c..c8eec44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
 do-not-install-smbclient4-and-nmbclient4
-26_heimdal_no_local_krb5_types

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