- add systemd services configs

[packages/nfs-utils.git] / nfs-utils-heimdal.patch

diff --git a/nfs-utils-heimdal.patch b/nfs-utils-heimdal.patch
index 189009d5069871c707fbc46a1401f036de64089b..c871fb651f5677b217525bdd33e580be397745e0 100644 (file)
--- a/nfs-utils-heimdal.patch
+++ b/nfs-utils-heimdal.patch
@@ -2,8 +2,8 @@
 +++ nfs-utils-1.2.3.dist/configure.ac  2010-10-03 14:47:50.699424847 +0200
 @@ -246,12 +246,6 @@
  
-   dnl check for nfsidmap libraries and headers
-   AC_LIBNFSIDMAP
+   dnl check for the keyutils libraries and headers
+   AC_KEYUTILS
 -
 -  dnl librpcsecgss already has a dependency on libgssapi,
 -  dnl but we need to make sure we get the right version
@@ -31,10 +31,10 @@
  dnl Checks librpcsec version
  AC_DEFUN([AC_RPCSEC_VERSION], [
  
--  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
+-  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
 +  dnl libgssglue is needed only for MIT Kerberos
 +  if test "$gssapi_lib" = gssapi_krb5; then
-+    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
++    PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.3])
 +  fi
  
    dnl TI-RPC replaces librpcsecgss
@@ -187,3 +187,19 @@
  
        if (maj_stat != GSS_S_COMPLETE) {
                pgsserr("gss_set_allowable_enctypes",
+--- nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c~ 2011-06-30 15:00:42.000000000 +0200
++++ nfs-utils-1.2.4/utils/gssd/svcgssd_krb5.c  2011-08-03 12:40:53.865782009 +0200
+@@ -186,8 +186,13 @@
+               num_enctypes = default_num_enctypes;
+       }
+ 
++#ifdef HAVE_HEIMDAL
++      maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, gssd_creds,
++                      num_enctypes, enctypes);
++#else
+       maj_stat = gss_set_allowable_enctypes(&min_stat, gssd_creds,
+                       &krb5oid, num_enctypes, enctypes);
++#endif
+       if (maj_stat != GSS_S_COMPLETE) {
+               printerr(1, "WARNING: gss_set_allowable_enctypes failed\n");
+               pgsserr("svcgssd_limit_krb5_enctypes: gss_set_allowable_enctypes",