oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

add back k, its needed by consumers.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22781 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-03-25 13:33:26 +00:00
parent dcaa26efaf
commit 51feb996d3
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/krb5/kcm.c
View File

@@ -96,6 +96,7 @@ try_door(krb5_context context,
static krb5_error_code static krb5_error_code
try_unix_socket(krb5_context context, try_unix_socket(krb5_context context,
krb5_kcmcache *k,
krb5_data *request_data, krb5_data *request_data,
krb5_data *response_data) krb5_data *response_data)
{ {
@@ -119,6 +120,7 @@ try_unix_socket(krb5_context context,
static krb5_error_code static krb5_error_code
kcm_send_request(krb5_context context, kcm_send_request(krb5_context context,
krb5_kcmcache *k,
krb5_storage *request, krb5_storage *request,
krb5_data *response_data) krb5_data *response_data)
{ {
@@ -141,7 +143,7 @@ kcm_send_request(krb5_context context,
ret = try_door(context, &request_data, response_data); ret = try_door(context, &request_data, response_data);
if (ret == 0 && response_data->length != 0) if (ret == 0 && response_data->length != 0)
break; break;
ret = try_unix_socket(context, &request_data, response_data); ret = try_unix_socket(context, k, &request_data, response_data);
if (ret == 0 && response_data->length != 0) if (ret == 0 && response_data->length != 0)
break; break;
} }
@@ -239,6 +241,7 @@ kcm_alloc(krb5_context context, const char *name, krb5_ccache *id)
static krb5_error_code static krb5_error_code
kcm_call(krb5_context context, kcm_call(krb5_context context,
krb5_kcmcache *k,
krb5_storage *request, krb5_storage *request,
krb5_storage **response_p, krb5_storage **response_p,
krb5_data *response_data_p) krb5_data *response_data_p)
@@ -251,7 +254,7 @@ kcm_call(krb5_context context,
if (response_p != NULL) if (response_p != NULL)
*response_p = NULL; *response_p = NULL;
ret = kcm_send_request(context, request, &response_data); ret = kcm_send_request(context, k, request, &response_data);
if (ret) { if (ret) {
return ret; return ret;
} }
@@ -344,7 +347,7 @@ kcm_gen_new(krb5_context context, krb5_ccache *id)
return ret; return ret;
} }
ret = kcm_call(context, request, &response, &response_data); ret = kcm_call(context, k, request, &response, &response_data);
if (ret) { if (ret) {
krb5_storage_free(request); krb5_storage_free(request);
kcm_free(context, id); kcm_free(context, id);
@@ -398,7 +401,7 @@ kcm_initialize(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -437,7 +440,7 @@ kcm_destroy(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -476,7 +479,7 @@ kcm_store_cred(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -526,7 +529,7 @@ kcm_retrieve(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, &response, &response_data); ret = kcm_call(context, k, request, &response, &response_data);
if (ret) { if (ret) {
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -570,7 +573,7 @@ kcm_get_principal(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, &response, &response_data); ret = kcm_call(context, k, request, &response, &response_data);
if (ret) { if (ret) {
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -616,7 +619,7 @@ kcm_get_first (krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, &response, &response_data); ret = kcm_call(context, k, request, &response, &response_data);
if (ret) { if (ret) {
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -677,7 +680,7 @@ kcm_get_next (krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, &response, &response_data); ret = kcm_call(context, k, request, &response, &response_data);
if (ret) { if (ret) {
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -727,7 +730,7 @@ kcm_end_get (krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
if (ret) { if (ret) {
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -783,7 +786,7 @@ kcm_remove_cred(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -814,7 +817,7 @@ kcm_set_flags(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -850,8 +853,7 @@ kcm_move(krb5_context context, krb5_ccache from, krb5_ccache to)
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
} }
ret = kcm_call(context, oldk, request, NULL, NULL);
ret = kcm_call(context, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -932,7 +934,7 @@ _krb5_kcm_noop(krb5_context context,
if (ret) if (ret)
return ret; return ret;
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -972,7 +974,7 @@ _krb5_kcm_chmod(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -1020,7 +1022,7 @@ _krb5_kcm_chown(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -1077,7 +1079,7 @@ _krb5_kcm_get_initial_ticket(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;
@@ -1133,7 +1135,7 @@ _krb5_kcm_get_ticket(krb5_context context,
return ret; return ret;
} }
ret = kcm_call(context, request, NULL, NULL); ret = kcm_call(context, k, request, NULL, NULL);
krb5_storage_free(request); krb5_storage_free(request);
return ret; return ret;