1 --- nfs-utils-1.0.9/configure.in.orig 2006-07-17 12:23:46.164440000 +0200
2 +++ nfs-utils-1.0.9/configure.in 2006-07-18 13:06:53.474440000 +0200
4 AC_MSG_ERROR([variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])
7 - PKG_CHECK_MODULES(GSSAPI, libgssapi >= 0.9)
8 + AC_CHECK_LIB(gssapi, main, [GSSAPI_LIBS="-lgssapi"], [AC_MSG_ERROR([Unable to locate libgssapi])])
9 + AC_SUBST(GSSAPI_LIBS)
13 diff -ur nfs-utils-1.0.8/utils/gssd/context.c nfs-utils-1.0.8.heimdal/utils/gssd/context.c
14 --- nfs-utils-1.0.8/utils/gssd/context.c 2006-03-28 02:48:27.000000000 +0200
15 +++ nfs-utils-1.0.8.heimdal/utils/gssd/context.c 2006-05-05 20:03:21.000000000 +0200
20 -#include <gssapi/gssapi.h>
23 #include <rpc/auth_gss.h>
25 diff -ur nfs-utils-1.0.8/utils/gssd/context_mit.c nfs-utils-1.0.8.heimdal/utils/gssd/context_mit.c
26 --- nfs-utils-1.0.8/utils/gssd/context_mit.c 2006-04-10 01:51:59.000000000 +0200
27 +++ nfs-utils-1.0.8.heimdal/utils/gssd/context_mit.c 2006-05-05 20:05:28.000000000 +0200
32 -#include <gssapi/gssapi.h>
35 #include <rpc/auth_gss.h>
37 diff -ur nfs-utils-1.0.8/utils/gssd/context_spkm3.c nfs-utils-1.0.8.heimdal/utils/gssd/context_spkm3.c
38 --- nfs-utils-1.0.8/utils/gssd/context_spkm3.c 2006-04-10 01:51:59.000000000 +0200
39 +++ nfs-utils-1.0.8.heimdal/utils/gssd/context_spkm3.c 2006-05-05 20:05:36.000000000 +0200
44 -#include <gssapi/gssapi.h>
47 #include <rpc/auth_gss.h>
49 diff -ur nfs-utils-1.0.8/utils/gssd/gss_oids.c nfs-utils-1.0.8.heimdal/utils/gssd/gss_oids.c
50 --- nfs-utils-1.0.8/utils/gssd/gss_oids.c 2005-08-26 03:20:13.000000000 +0200
51 +++ nfs-utils-1.0.8.heimdal/utils/gssd/gss_oids.c 2006-05-05 20:03:44.000000000 +0200
55 #include <sys/types.h>
56 -#include <gssapi/gssapi.h>
59 /* from kerberos source, gssapi_krb5.c */
60 gss_OID_desc krb5oid =
61 diff -ur nfs-utils-1.0.8/utils/gssd/gss_util.c nfs-utils-1.0.8.heimdal/utils/gssd/gss_util.c
62 --- nfs-utils-1.0.8/utils/gssd/gss_util.c 2005-08-26 03:27:18.000000000 +0200
63 +++ nfs-utils-1.0.8.heimdal/utils/gssd/gss_util.c 2006-05-05 20:04:08.000000000 +0200
65 #include <sys/param.h>
68 -#include <gssapi/gssapi.h>
70 #if defined(HAVE_KRB5) && !defined(GSS_C_NT_HOSTBASED_SERVICE)
71 #include <gssapi/gssapi_generic.h>
72 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
73 diff -ur nfs-utils-1.0.8/utils/gssd/gssd.h nfs-utils-1.0.8.heimdal/utils/gssd/gssd.h
74 --- nfs-utils-1.0.8/utils/gssd/gssd.h 2006-03-28 02:50:03.000000000 +0200
75 +++ nfs-utils-1.0.8.heimdal/utils/gssd/gssd.h 2006-05-05 20:04:27.000000000 +0200
78 #include <sys/types.h>
79 #include <sys/queue.h>
80 -#include <gssapi/gssapi.h>
83 #define MAX_FILE_NAMELEN 32
84 #define FD_ALLOC_BLOCK 32
85 diff -ur nfs-utils-1.0.8/utils/gssd/gssd_proc.c nfs-utils-1.0.8.heimdal/utils/gssd/gssd_proc.c
86 --- nfs-utils-1.0.8/utils/gssd/gssd_proc.c 2006-04-10 11:57:20.000000000 +0200
87 +++ nfs-utils-1.0.8.heimdal/utils/gssd/gssd_proc.c 2006-05-05 20:04:35.000000000 +0200
92 -#include <gssapi/gssapi.h>
97 diff -ur nfs-utils-1.0.8/utils/gssd/krb5_util.c nfs-utils-1.0.8.heimdal/utils/gssd/krb5_util.c
98 --- nfs-utils-1.0.8/utils/gssd/krb5_util.c 2006-03-28 02:50:03.000000000 +0200
99 +++ nfs-utils-1.0.8.heimdal/utils/gssd/krb5_util.c 2006-05-05 20:04:53.000000000 +0200
104 -#include <gssapi/gssapi.h>
106 #ifdef USE_PRIVATE_KRB5_FUNCTIONS
107 #include <gssapi/gssapi_krb5.h>
109 diff -ur nfs-utils-1.0.8/utils/gssd/svcgssd.h nfs-utils-1.0.8.heimdal/utils/gssd/svcgssd.h
110 --- nfs-utils-1.0.8/utils/gssd/svcgssd.h 2006-03-27 02:30:09.000000000 +0200
111 +++ nfs-utils-1.0.8.heimdal/utils/gssd/svcgssd.h 2006-05-05 20:05:02.000000000 +0200
114 #include <sys/types.h>
115 #include <sys/queue.h>
116 -#include <gssapi/gssapi.h>
119 void handle_nullreq(FILE *f);
121 --- nfs-utils-1.0.11/utils/gssd/svcgssd_mech2file.c.orig 2007-02-25 20:42:02.000000000 +0100
122 +++ nfs-utils-1.0.11/utils/gssd/svcgssd_mech2file.c 2007-03-10 23:57:23.421385359 +0100
127 -#include <gssapi/gssapi.h>
132 --- nfs-utils-1.0.12/utils/gssd/gssd.h~ 2007-03-20 19:16:11.000000000 +0100
133 +++ nfs-utils-1.0.12/utils/gssd/gssd.h 2007-03-20 19:28:43.000000000 +0100
135 #define GSSD_DEFAULT_CRED_DIR "/tmp"
136 #define GSSD_DEFAULT_CRED_PREFIX "krb5cc_"
137 #define GSSD_DEFAULT_MACHINE_CRED_SUFFIX "machine"
138 -#define GSSD_DEFAULT_KEYTAB_FILE "/etc/krb5.keytab"
139 +#define GSSD_DEFAULT_KEYTAB_FILE "/etc/heimdal/krb5.keytab"
140 #define GSSD_SERVICE_NAME "nfs"
141 #define GSSD_SERVICE_NAME_LEN 3
143 --- nfs-utils-1.0.12/utils/gssd/gssd.man~ 2007-02-27 05:55:40.000000000 +0100
144 +++ nfs-utils-1.0.12/utils/gssd/gssd.man 2007-03-20 19:29:18.000000000 +0100
146 to use the keys for principals nfs/hostname in
148 to obtain machine credentials.
149 -The default value is "/etc/krb5.keytab".
150 +The default value is "/etc/heimdal/krb5.keytab".
154 --- nfs-utils-1.0.12/utils/gssd/svcgssd.c~ 2007-02-27 05:55:40.000000000 +0100
155 +++ nfs-utils-1.0.12/utils/gssd/svcgssd.c 2007-03-20 19:29:27.000000000 +0100
157 printerr(0, "unable to obtain root (machine) credentials\n");
158 printerr(0, "do you have a keytab entry for "
159 "nfs/<your.host>@<YOUR.REALM> in "
160 - "/etc/krb5.keytab?\n");
161 + "/etc/heimdal/krb5.keytab?\n");