]> git.pld-linux.org Git - packages/nfs-utils.git/blame - nfs-utils-heimdal.patch
projects / packages / nfs-utils.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- start mountd before nfsd, from Neil Brown:
[packages/nfs-utils.git] / nfs-utils-heimdal.patch
CommitLineData
ca39aafb
JB		 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
3@@ -164,7 +164,8 @@
4 AC_MSG_ERROR([variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])
2da61068
JR		 5 ]
6 )
ca39aafb 7- PKG_CHECK_MODULES(GSSAPI, libgssapi >= 0.9)
2da61068
JR		 8+ AC_CHECK_LIB(gssapi, main, [GSSAPI_LIBS="-lgssapi"], [AC_MSG_ERROR([Unable to locate libgssapi])])
9+ AC_SUBST(GSSAPI_LIBS)
10 fi
11
12 fi
13diff -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
16@@ -32,7 +32,7 @@
17 #include <stdio.h>
18 #include <syslog.h>
19 #include <string.h>
20-#include <gssapi/gssapi.h>
21+#include <gssapi.h>
22 #include <rpc/rpc.h>
23 #include <rpc/auth_gss.h>
24 #include "gss_util.h"
25diff -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
28@@ -32,7 +32,7 @@
29 #include <stdio.h>
30 #include <syslog.h>
31 #include <string.h>
32-#include <gssapi/gssapi.h>
33+#include <gssapi.h>
34 #include <rpc/rpc.h>
35 #include <rpc/auth_gss.h>
36 #include "gss_util.h"
37diff -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
40@@ -32,7 +32,7 @@
41 #include <stdio.h>
42 #include <syslog.h>
43 #include <string.h>
44-#include <gssapi/gssapi.h>
45+#include <gssapi.h>
46 #include <rpc/rpc.h>
47 #include <rpc/auth_gss.h>
48 #include "gss_util.h"
49diff -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
52@@ -29,7 +29,7 @@
53 */
54
55 #include <sys/types.h>
56-#include <gssapi/gssapi.h>
57+#include <gssapi.h>
58
59 /* from kerberos source, gssapi_krb5.c */
60 gss_OID_desc krb5oid =
61diff -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
64@@ -72,7 +72,7 @@
65 #include <sys/param.h>
66 #include <netdb.h>
67 #include <fcntl.h>
68-#include <gssapi/gssapi.h>
69+#include <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
73diff -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
76@@ -33,7 +33,7 @@
77
78 #include <sys/types.h>
79 #include <sys/queue.h>
80-#include <gssapi/gssapi.h>
81+#include <gssapi.h>
82
83 #define MAX_FILE_NAMELEN 32
84 #define FD_ALLOC_BLOCK 32
85diff -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
88@@ -59,7 +59,7 @@
89 #include <signal.h>
90 #include <unistd.h>
91 #include <errno.h>
92-#include <gssapi/gssapi.h>
93+#include <gssapi.h>
94 #include <netdb.h>
95
96 #include "gssd.h"
97diff -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
100@@ -107,7 +107,7 @@
101 #include <dirent.h>
102 #include <errno.h>
103 #include <time.h>
104-#include <gssapi/gssapi.h>
105+#include <gssapi.h>
106 #ifdef USE_PRIVATE_KRB5_FUNCTIONS
107 #include <gssapi/gssapi_krb5.h>
108 #endif
109diff -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
112@@ -33,7 +33,7 @@
113
114 #include <sys/types.h>
115 #include <sys/queue.h>
116-#include <gssapi/gssapi.h>
117+#include <gssapi.h>
118
119 void handle_nullreq(FILE *f);
120 void gssd_run(void);
797b7f1f
JB		 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
123@@ -36,7 +36,7 @@
124
125 #include "config.h"
126
127-#include <gssapi/gssapi.h>
128+#include <gssapi.h>
129 #include <string.h>
130
131
6242527d
JR		 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
134@@ -47,7 +47,7 @@
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
142
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
145@@ -31,7 +31,7 @@
146 to use the keys for principals nfs/hostname in
147 .I keytab
148 to obtain machine credentials.
149-The default value is "/etc/krb5.keytab".
150+The default value is "/etc/heimdal/krb5.keytab".
151 .\".TP
152 .\".B -m
153 .\"Ordinarily,
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
156@@ -232,7 +232,7 @@
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");
162 exit(1);
163 }
164
Kernel NFS server
This page took 0.083598 seconds and 4 git commands to generate.