equal
deleted
inserted
replaced
14 # 23514346 The k5identity tests should be re-enabled when MIT ticket 8420 is fixed upstream |
14 # 23514346 The k5identity tests should be re-enabled when MIT ticket 8420 is fixed upstream |
15 # should also be addressed. |
15 # should also be addressed. |
16 # |
16 # |
17 # Patch source: in-house |
17 # Patch source: in-house |
18 # |
18 # |
19 diff --git a/src/lib/krb5/ccache/ccselect.c b/src/lib/krb5/ccache/ccselect.c |
|
20 --- a/src/lib/krb5/ccache/ccselect.c |
19 --- a/src/lib/krb5/ccache/ccselect.c |
21 +++ b/src/lib/krb5/ccache/ccselect.c |
20 +++ b/src/lib/krb5/ccache/ccselect.c |
22 @@ -59,12 +59,17 @@ load_modules(krb5_context context) |
21 @@ -59,12 +59,17 @@ load_modules(krb5_context context) |
23 krb5_plugin_initvt_fn *modules = NULL, *mod; |
22 krb5_plugin_initvt_fn *modules = NULL, *mod; |
24 size_t count; |
23 size_t count; |
37 -#endif |
36 -#endif |
38 +#endif /* ************** END IFDEF'ed OUT ***************************** */ |
37 +#endif /* ************** END IFDEF'ed OUT ***************************** */ |
39 |
38 |
40 ret = k5_plugin_register(context, PLUGIN_INTERFACE_CCSELECT, "realm", |
39 ret = k5_plugin_register(context, PLUGIN_INTERFACE_CCSELECT, "realm", |
41 ccselect_realm_initvt); |
40 ccselect_realm_initvt); |
42 diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man |
|
43 --- a/src/man/krb5.conf.man |
41 --- a/src/man/krb5.conf.man |
44 +++ b/src/man/krb5.conf.man |
42 +++ b/src/man/krb5.conf.man |
45 @@ -943,10 +943,6 @@ dynamic modules, the following built\-in modules exist (and may be |
43 @@ -943,10 +943,6 @@ dynamic modules, the following built\-in modules exist (and may be |
46 disabled with the disable tag): |
44 disabled with the disable tag): |
47 .INDENT 0.0 |
45 .INDENT 0.0 |
51 -client principal |
49 -client principal |
52 -.TP |
50 -.TP |
53 .B \fBrealm\fP |
51 .B \fBrealm\fP |
54 Uses the service realm to guess an appropriate cache from the |
52 Uses the service realm to guess an appropriate cache from the |
55 collection |
53 collection |
56 diff --git a/src/tests/gssapi/t_ccselect.py b/src/tests/gssapi/t_ccselect.py |
|
57 --- a/src/tests/gssapi/t_ccselect.py |
54 --- a/src/tests/gssapi/t_ccselect.py |
58 +++ b/src/tests/gssapi/t_ccselect.py |
55 +++ b/src/tests/gssapi/t_ccselect.py |
59 @@ -103,22 +103,24 @@ r1.run(['./t_ccselect', gssserver], expected_code=1) |
56 @@ -103,22 +103,24 @@ r1.run(['./t_ccselect', gssserver], expected_code=1) |
60 r1.kinit(bob, password('bob')) |
57 r1.kinit(bob, password('bob')) |
61 |
58 |
96 +# fail('Expected error not seen when k5identity selects bad principal.') |
93 +# fail('Expected error not seen when k5identity selects bad principal.') |
97 +sys.stderr.write("Support of k5identity ccselect plugin disabled, skipping " |
94 +sys.stderr.write("Support of k5identity ccselect plugin disabled, skipping " |
98 + "k5identity tests...\n"); |
95 + "k5identity tests...\n"); |
99 |
96 |
100 success('GSSAPI credential selection tests') |
97 success('GSSAPI credential selection tests') |
101 diff --git a/src/tests/gssapi/t_client_keytab.py b/src/tests/gssapi/t_client_keytab.py |
|
102 --- a/src/tests/gssapi/t_client_keytab.py |
98 --- a/src/tests/gssapi/t_client_keytab.py |
103 +++ b/src/tests/gssapi/t_client_keytab.py |
99 +++ b/src/tests/gssapi/t_client_keytab.py |
104 @@ -21,15 +21,17 @@ if realm.user_princ not in out: |
100 @@ -21,15 +21,17 @@ if realm.user_princ not in out: |
105 realm.run([kdestroy]) |
101 realm.run([kdestroy]) |
106 |
102 |