[Pkg-samba-maint] [samba] 01/01: * Fix compatibility with newer versions of the Heimdal HDB API. + Update 26_heimdal_compat: Fix initialization of HDB plugin. Thanks Jeff Clark. Closes: #732342 + Add dependency on specific version of the Heimdal HDB API. Closes: #732344

Sun Jan 19 17:16:52 UTC 2014

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

jelmer pushed a commit to branch master
in repository samba.

commit 5b2ba2b989354334f6b8343dc2a512836c2e74a2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jan 19 17:16:29 2014 +0000

    * Fix compatibility with newer versions of the Heimdal HDB API.
      + Update 26_heimdal_compat: Fix initialization of HDB plugin. Thanks Jeff
        Clark. Closes: #732342
      + Add dependency on specific version of the Heimdal HDB API.
        Closes: #732344
---
 debian/changelog                 |  5 ++++
 debian/control                   |  1 +
 debian/patches/26_heimdal_compat | 52 ++++++++++++++++++++++++++++------------
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3602774..f19f4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ samba (2:4.1.4+dfsg-2) UNRELEASED; urgency=medium
   * Bump standards version to 3.9.5 (no changes).
   * Move libpac, db_glue and hdb module from samba-libs to samba package
     to reduce size and dependency set of libs package.
+  * Fix compatibility with newer versions of the Heimdal HDB API.
+    + Update 26_heimdal_compat: Fix initialization of HDB plugin. Thanks Jeff
+      Clark. Closes: #732342
+    + Add dependency on specific version of the Heimdal HDB API.
+      Closes: #732344
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sat, 18 Jan 2014 20:26:35 +0000
 
diff --git a/debian/control b/debian/control
index 13db777..c7b3c2a 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,7 @@ Package: samba
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: adduser,
+         heimdal-hdb-api-8,
          libpam-modules,
          libpam-runtime (>= 1.0.1-11),
          lsb-base (>= 4.1+Debian),
diff --git a/debian/patches/26_heimdal_compat b/debian/patches/26_heimdal_compat
index a46a69a..9c72d6b 100644
--- a/debian/patches/26_heimdal_compat
+++ b/debian/patches/26_heimdal_compat
@@ -1,8 +1,7 @@
-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
+Index: samba-4.1.3+dfsg/source4/heimdal_build/krb5-types.h
+===================================================================
+--- samba-4.1.3+dfsg.orig/source4/heimdal_build/krb5-types.h	2013-06-13 04:21:02.000000000 -0500
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -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 $ */
@@ -18,11 +17,11 @@ index 4f55a80..0000000
 -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
+Index: samba-4.1.3+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c
+===================================================================
+--- samba-4.1.3+dfsg.orig/source4/rpc_server/backupkey/dcesrv_backupkey.c	2013-06-13 04:21:02.000000000 -0500
++++ samba-4.1.3+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c	2014-01-07 06:06:59.000000000 -0600
+@@ -972,7 +972,7 @@
  static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_call, struct ldb_context *ldb_ctx, const char *dn)
  {
  
@@ -31,16 +30,39 @@ index 87799db..dac3678 100644
  	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,
+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


