Gentoo Archives: gentoo-commits

From: "Stefaan De Roeck (stefaan)" <stefaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs-5.0.3-heimdal.patch
Date: Sat, 03 May 2008 09:17:02
Message-Id: E1JsDrY-0004AA-Cw@stork.gentoo.org
1 stefaan 08/05/03 09:17:00
2
3 Added: autofs-5.0.3-heimdal.patch
4 Log:
5 Support also heimdal's krb5 implementation (fixes bug #210762) + some QA
6 (Portage version: 2.1.5_rc6)
7
8 Revision Changes Path
9 1.1 net-fs/autofs/files/autofs-5.0.3-heimdal.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/autofs/files/autofs-5.0.3-heimdal.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/autofs/files/autofs-5.0.3-heimdal.patch?rev=1.1&content-type=text/plain
13
14 Index: autofs-5.0.3-heimdal.patch
15 ===================================================================
16 --- autofs-5.0.3.orig/modules/cyrus-sasl.c 2008-04-28 16:17:03.000000000 +0200
17 +++ autofs-5.0.3/modules/cyrus-sasl.c 2008-04-28 16:41:58.000000000 +0200
18 @@ -66,6 +66,15 @@
19 #endif
20 #endif
21
22 +/**
23 + * The type of a principal is different for MIT Krb5 and Heimdal.
24 + * These macros are provided by Heimdal, and introduced here for MIT.
25 + */
26 +#ifndef krb5_realm_length
27 +#define krb5_realm_length(r) ((r).length)
28 +#define krb5_realm_data(r) ((r).data)
29 +#endif
30 +
31 /*
32 * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
33 * environment variable so that the library knows where to find it.
34 @@ -452,11 +461,11 @@
35
36 /* setup a principal for the ticket granting service */
37 ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
38 - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
39 - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
40 + krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
41 + krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
42 strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
43 - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
44 - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
45 + krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
46 + krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
47 0);
48 if (ret) {
49 error(logopt,
50
51
52
53
54 --
55 gentoo-commits@l.g.o mailing list