1 From 1451b65fec69ff35e029b4770dcb4927ba57060a Mon Sep 17 00:00:00 2001
2 From: Robbie Harwood <rharwood@redhat.com>
3 Date: Fri, 17 Nov 2017 13:53:37 -0500
4 Subject: [PATCH] Separate cred and ccache manipulation in
5 gpp_store_remote_creds()
7 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
8 Reviewed-by: Simo Sorce <simo@redhat.com>
9 (cherry picked from commit 221b553bfb4082085d05b40da9a04c1f7e4af533)
11 proxy/src/mechglue/gpp_creds.c | 62 +++++++++++++++++++++-------------
12 1 file changed, 39 insertions(+), 23 deletions(-)
14 diff --git a/proxy/src/mechglue/gpp_creds.c b/proxy/src/mechglue/gpp_creds.c
15 index 6bdff45..3ebd726 100644
16 --- a/proxy/src/mechglue/gpp_creds.c
17 +++ b/proxy/src/mechglue/gpp_creds.c
18 @@ -136,6 +136,40 @@ bool gpp_creds_are_equal(gssx_cred *a, gssx_cred *b)
22 +static krb5_error_code gpp_construct_cred(gssx_cred *creds, krb5_context ctx,
23 + krb5_creds *cred, char *cred_name)
27 + krb5_error_code ret = 0;
29 + memset(cred, 0, sizeof(*cred));
31 + memcpy(cred_name, creds->desired_name.display_name.octet_string_val,
32 + creds->desired_name.display_name.octet_string_len);
33 + cred_name[creds->desired_name.display_name.octet_string_len] = '\0';
35 + ret = krb5_parse_name(ctx, cred_name, &cred->client);
40 + ret = krb5_parse_name(ctx, GPKRB_SRV_NAME, &cred->server);
45 + cred->ticket.data = malloc(GPKRB_MAX_CRED_SIZE);
46 + xdrmem_create(&xdrctx, cred->ticket.data, GPKRB_MAX_CRED_SIZE,
48 + xdrok = xdr_gssx_cred(&xdrctx, creds);
52 + cred->ticket.length = xdr_getpos(&xdrctx);
56 uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
57 gss_const_key_value_set_t cred_store,
59 @@ -145,17 +179,18 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
62 char cred_name[creds->desired_name.display_name.octet_string_len + 1];
69 - memset(&cred, 0, sizeof(cred));
71 ret = krb5_init_context(&ctx);
74 + ret = gpp_construct_cred(creds, ctx, &cred, cred_name);
80 for (unsigned i = 0; i < cred_store->count; i++) {
81 if (strcmp(cred_store->elements[i].key, "ccache") == 0) {
82 @@ -175,25 +210,6 @@ uint32_t gpp_store_remote_creds(uint32_t *min, bool default_creds,
86 - memcpy(cred_name, creds->desired_name.display_name.octet_string_val,
87 - creds->desired_name.display_name.octet_string_len);
88 - cred_name[creds->desired_name.display_name.octet_string_len] = '\0';
90 - ret = krb5_parse_name(ctx, cred_name, &cred.client);
93 - ret = krb5_parse_name(ctx, GPKRB_SRV_NAME, &cred.server);
96 - cred.ticket.data = malloc(GPKRB_MAX_CRED_SIZE);
97 - xdrmem_create(&xdrctx, cred.ticket.data, GPKRB_MAX_CRED_SIZE, XDR_ENCODE);
98 - xdrok = xdr_gssx_cred(&xdrctx, creds);
103 - cred.ticket.length = xdr_getpos(&xdrctx);
105 cc_type = krb5_cc_get_type(ctx, ccache);
106 if (strcmp(cc_type, "FILE") == 0) {
107 /* FILE ccaches don't handle updates properly: if they have the same