]>
Commit | Line | Data |
---|---|---|
f6198674 AM |
1 | diff -urN nfs-utils-1.0.7.org/configure.in nfs-utils-1.0.7/configure.in |
2 | --- nfs-utils-1.0.7.org/configure.in 2004-12-17 05:09:09.000000000 +0100 | |
3 | +++ nfs-utils-1.0.7/configure.in 2005-02-27 21:11:35.317266320 +0100 | |
4 | @@ -161,7 +161,7 @@ | |
5 | dnl MIT Kerberos on Fedora Core 1 | |
6 | K5CONFIG="" | |
7 | if test -f $dir/bin/krb5-config; then | |
8 | - K5CONFIG=$dir/bin/krb5-config | |
9 | + K5CONFIG="$dir/bin/krb5-config" | |
10 | elif test -f "/usr/kerberos/bin/krb5-config"; then | |
11 | K5CONFIG="/usr/kerberos/bin/krb5-config" | |
12 | fi | |
13 | @@ -188,7 +188,7 @@ | |
14 | dnl of Heimdal Kerberos on SuSe | |
15 | elif test \( -f $dir/include/heim_err.h -o\ | |
16 | -f $dir/include/heimdal/heim_err.h \) -a \ | |
17 | - -f $dir/lib/libroken.a; then | |
18 | + -f $dir/lib/libroken.so; then | |
19 | AC_DEFINE(HAVE_HEIMDAL) | |
20 | KRBDIR="$dir" | |
21 | K5VERS=`$K5CONFIG --version | head -1 | awk '{split($2,v,"."); print v[[1]]v[[2]]v[[3]] }'` | |
22 | @@ -200,9 +200,10 @@ | |
23 | AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES),,$KRBLIB) | |
24 | AC_CHECK_LIB(gssapi, gss_krb5_ccache_name, | |
25 | AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME),,$KRBLIB) | |
26 | + CFLAGS="$CFLAGS -I/usr/include/et" | |
27 | break | |
28 | fi | |
29 | - CFLAGS=$CFLAGS `K5CONFIG --cflags` | |
30 | + CFLAGS="$CFLAGS -I/usr/include/et `$K5CONFIG --cflags`" | |
31 | fi | |
32 | done | |
33 | dnl We didn't find a usable Kerberos environment | |
34 | diff -urN nfs-utils-1.0.7.org/support/lib/Makefile nfs-utils-1.0.7/support/lib/Makefile | |
35 | --- nfs-utils-1.0.7.org/support/lib/Makefile 2004-10-19 02:22:58.000000000 +0200 | |
36 | +++ nfs-utils-1.0.7/support/lib/Makefile 2005-02-27 22:21:21.819821192 +0100 | |
37 | @@ -1,7 +1,7 @@ | |
38 | ||
39 | include $(TOP)rules.mk | |
40 | ||
41 | -LIBS = libnfs.a libexport.a libmisc.a librpc.a libgssapi.a | |
42 | +LIBS = libnfs.a libexport.a libmisc.a librpc.a | |
43 | ||
44 | all install:: $(LIBS) | |
45 | @: | |
46 | diff -urN nfs-utils-1.0.7.org/utils/gssd/krb5_util.c nfs-utils-1.0.7/utils/gssd/krb5_util.c | |
47 | --- nfs-utils-1.0.7.org/utils/gssd/krb5_util.c 2004-10-19 02:23:08.000000000 +0200 | |
48 | +++ nfs-utils-1.0.7/utils/gssd/krb5_util.c 2005-02-27 22:30:21.687748792 +0100 | |
49 | @@ -120,6 +120,8 @@ | |
50 | #include "gss_oids.h" | |
51 | #include "krb5_util.h" | |
52 | ||
53 | +#define krb5_free_unparsed_name(con,val) krb5_xfree((char *)(val)) | |
54 | + | |
55 | /* Global list of principals/cache file names for machine credentials */ | |
56 | struct gssd_k5_kt_princ *gssd_k5_kt_princ_list = NULL; | |
57 | ||
58 | @@ -466,8 +468,8 @@ | |
59 | } | |
60 | printerr(2, "Processing keytab entry for principal '%s'\n", | |
61 | pname); | |
62 | - if ( (kte.principal->data[0].length == GSSD_SERVICE_NAME_LEN) && | |
63 | - (strncmp(kte.principal->data[0].data, GSSD_SERVICE_NAME, | |
64 | + if ( (kte.principal->name.name_string.len == GSSD_SERVICE_NAME_LEN) && | |
65 | + (strncmp(kte.principal->name.name_string.val[0], GSSD_SERVICE_NAME, | |
66 | GSSD_SERVICE_NAME_LEN) == 0) && | |
67 | (!gssd_have_realm_ple(&kte.principal->realm)) ) { | |
68 | printerr(2, "We will use this entry (%s)\n", pname); | |
69 | @@ -484,8 +486,8 @@ | |
70 | ple->ccname = NULL; | |
71 | ple->endtime = 0; | |
72 | if ((ple->realm = | |
73 | - strndup(kte.principal->realm.data, | |
74 | - kte.principal->realm.length)) | |
75 | + strndup(kte.principal->realm, | |
76 | + strlen(kte.principal->realm))) | |
77 | == NULL) { | |
78 | printerr(0, "ERROR: %s while copying realm to " | |
79 | "principal list entry\n", | |
80 | diff -urN nfs-utils-1.0.7.org/utils/gssd/Makefile nfs-utils-1.0.7/utils/gssd/Makefile | |
81 | --- nfs-utils-1.0.7.org/utils/gssd/Makefile 2004-10-19 02:23:08.000000000 +0200 | |
82 | +++ nfs-utils-1.0.7/utils/gssd/Makefile 2005-02-27 22:22:02.385654248 +0100 | |
83 | @@ -6,7 +6,7 @@ | |
84 | PREFIX = rpc. | |
85 | OBJS = gssd.o gssd_main_loop.o gssd_proc.o err_util.o gss_util.o \ | |
86 | gss_oids.o context.o context_heimdal.o krb5_util.o | |
87 | -LIBDEPS = $(TOP)support/lib/librpc.a $(TOP)support/lib/libgssapi.a | |
88 | +LIBDEPS = $(TOP)support/lib/librpc.a | |
89 | LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpc -lgssapi -ldl $(KRBLIB) | |
90 | MAN8 = gssd | |
91 | ||
92 | diff -urN nfs-utils-1.0.7.org/utils/svcgssd/Makefile nfs-utils-1.0.7/utils/svcgssd/Makefile | |
93 | --- nfs-utils-1.0.7.org/utils/svcgssd/Makefile 2004-11-22 06:41:13.000000000 +0100 | |
94 | +++ nfs-utils-1.0.7/utils/svcgssd/Makefile 2005-02-27 22:22:26.624969312 +0100 | |
95 | @@ -6,7 +6,7 @@ | |
96 | PREFIX = rpc. | |
97 | OBJS = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \ | |
98 | gss_oids.o context.o context_heimdal.o cacheio.o svcgssd_mech2file.o | |
99 | -LIBDEPS = $(TOP)support/lib/librpc.a $(TOP)support/lib/libgssapi.a | |
100 | +LIBDEPS = $(TOP)support/lib/librpc.a | |
101 | LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpc -lgssapi -ldl $(KRBLIB) -lnfsidmap | |
102 | MAN8 = svcgssd | |
103 |