diff options
author | Ken Raeburn <raeburn@mit.edu> | 2009-02-09 23:43:04 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2009-02-09 23:43:04 +0000 |
commit | 5b80063aebdb3eb2a330a47648137369661e5716 (patch) | |
tree | f39689f287c76ec45cd60aa151421f5ae3c9108c /src/ccapi | |
parent | 94cf674975471ec6c6bfa66f21de1559cc74983b (diff) | |
download | krb5-5b80063aebdb3eb2a330a47648137369661e5716.zip krb5-5b80063aebdb3eb2a330a47648137369661e5716.tar.gz krb5-5b80063aebdb3eb2a330a47648137369661e5716.tar.bz2 |
Rename functions from k5_ipc_stream_* to krb5int_ipc_stream_*, because some of them will have to be exported
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21938 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi')
-rw-r--r-- | src/ccapi/common/cci_cred_union.c | 108 | ||||
-rw-r--r-- | src/ccapi/common/cci_identifier.c | 12 | ||||
-rw-r--r-- | src/ccapi/common/cci_message.c | 26 | ||||
-rw-r--r-- | src/ccapi/common/cci_message.h | 8 | ||||
-rw-r--r-- | src/ccapi/lib/ccapi_ccache.c | 94 | ||||
-rw-r--r-- | src/ccapi/lib/ccapi_ccache_iterator.c | 4 | ||||
-rw-r--r-- | src/ccapi/lib/ccapi_context.c | 86 | ||||
-rw-r--r-- | src/ccapi/lib/ccapi_credentials_iterator.c | 4 | ||||
-rw-r--r-- | src/ccapi/lib/ccapi_ipc.c | 12 | ||||
-rw-r--r-- | src/ccapi/lib/win/ccapi_os_ipc.cxx | 6 | ||||
-rw-r--r-- | src/ccapi/lib/win/ccs_reply_proc.c | 4 | ||||
-rw-r--r-- | src/ccapi/lib/win/debug.exports | 6 | ||||
-rw-r--r-- | src/ccapi/server/ccs_cache_collection.c | 48 | ||||
-rw-r--r-- | src/ccapi/server/ccs_ccache.c | 54 | ||||
-rw-r--r-- | src/ccapi/server/ccs_ccache_iterator.c | 4 | ||||
-rw-r--r-- | src/ccapi/server/ccs_credentials_iterator.c | 4 | ||||
-rw-r--r-- | src/ccapi/server/ccs_server.c | 12 | ||||
-rw-r--r-- | src/ccapi/server/win/WorkItem.cpp | 12 | ||||
-rw-r--r-- | src/ccapi/server/win/ccs_os_server.cpp | 10 | ||||
-rw-r--r-- | src/ccapi/server/win/ccs_request_proc.c | 6 |
20 files changed, 260 insertions, 260 deletions
diff --git a/src/ccapi/common/cci_cred_union.c b/src/ccapi/common/cci_cred_union.c index 9740ffd..94aebdd 100644 --- a/src/ccapi/common/cci_cred_union.c +++ b/src/ccapi/common/cci_cred_union.c @@ -63,59 +63,59 @@ static cc_uint32 cci_credentials_v4_read (cc_credentials_v4_t **out_v4creds, } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &v4creds->version); + err = krb5int_ipc_stream_read_uint32 (io_stream, &v4creds->version); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->principal, cc_v4_name_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->principal, cc_v4_name_size); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->principal_instance, cc_v4_instance_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->principal_instance, cc_v4_instance_size); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->service, cc_v4_name_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->service, cc_v4_name_size); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->service_instance, cc_v4_instance_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->service_instance, cc_v4_instance_size); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->realm, cc_v4_realm_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->realm, cc_v4_realm_size); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->session_key, cc_v4_key_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->session_key, cc_v4_key_size); } if (!err) { - err = k5_ipc_stream_read_int32 (io_stream, &v4creds->kvno); + err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->kvno); } if (!err) { - err = k5_ipc_stream_read_int32 (io_stream, &v4creds->string_to_key_type); + err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->string_to_key_type); } if (!err) { - err = k5_ipc_stream_read_time (io_stream, &v4creds->issue_date); + err = krb5int_ipc_stream_read_time (io_stream, &v4creds->issue_date); } if (!err) { - err = k5_ipc_stream_read_int32 (io_stream, &v4creds->lifetime); + err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->lifetime); } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &v4creds->address); + err = krb5int_ipc_stream_read_uint32 (io_stream, &v4creds->address); } if (!err) { - err = k5_ipc_stream_read_int32 (io_stream, &v4creds->ticket_size); + err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->ticket_size); } if (!err) { - err = k5_ipc_stream_read (io_stream, v4creds->ticket, cc_v4_ticket_size); + err = krb5int_ipc_stream_read (io_stream, v4creds->ticket, cc_v4_ticket_size); } if (!err) { @@ -139,59 +139,59 @@ static cc_uint32 cci_credentials_v4_write (cc_credentials_v4_t *in_v4creds, if (!in_v4creds) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_v4creds->version); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_v4creds->version); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->principal, cc_v4_name_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->principal, cc_v4_name_size); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->principal_instance, cc_v4_instance_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->principal_instance, cc_v4_instance_size); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->service, cc_v4_name_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->service, cc_v4_name_size); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->service_instance, cc_v4_instance_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->service_instance, cc_v4_instance_size); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->realm, cc_v4_realm_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->realm, cc_v4_realm_size); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->session_key, cc_v4_key_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->session_key, cc_v4_key_size); } if (!err) { - err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->kvno); + err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->kvno); } if (!err) { - err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->string_to_key_type); + err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->string_to_key_type); } if (!err) { - err = k5_ipc_stream_write_time (io_stream, in_v4creds->issue_date); + err = krb5int_ipc_stream_write_time (io_stream, in_v4creds->issue_date); } if (!err) { - err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->lifetime); + err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->lifetime); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_v4creds->address); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_v4creds->address); } if (!err) { - err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->ticket_size); + err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->ticket_size); } if (!err) { - err = k5_ipc_stream_write (io_stream, in_v4creds->ticket, cc_v4_ticket_size); + err = krb5int_ipc_stream_write (io_stream, in_v4creds->ticket, cc_v4_ticket_size); } return cci_check_error (err); @@ -249,11 +249,11 @@ static cc_uint32 cci_cc_data_read (cc_data *io_ccdata, if (!io_ccdata) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &type); + err = krb5int_ipc_stream_read_uint32 (io_stream, &type); } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &length); + err = krb5int_ipc_stream_read_uint32 (io_stream, &length); } if (!err && length > 0) { @@ -261,7 +261,7 @@ static cc_uint32 cci_cc_data_read (cc_data *io_ccdata, if (!data) { err = cci_check_error (ccErrNoMem); } if (!err) { - err = k5_ipc_stream_read (io_stream, data, length); + err = krb5int_ipc_stream_read (io_stream, data, length); } } @@ -288,15 +288,15 @@ static cc_uint32 cci_cc_data_write (cc_data *in_ccdata, if (!in_ccdata) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_ccdata->type); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_ccdata->type); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_ccdata->length); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_ccdata->length); } if (!err && in_ccdata->length > 0) { - err = k5_ipc_stream_write (io_stream, in_ccdata->data, in_ccdata->length); + err = krb5int_ipc_stream_write (io_stream, in_ccdata->data, in_ccdata->length); } return cci_check_error (err); @@ -340,7 +340,7 @@ static cc_uint32 cci_cc_data_array_read (cc_data ***io_ccdata_array, if (!io_ccdata_array) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &count); + err = krb5int_ipc_stream_read_uint32 (io_stream, &count); } if (!err && count > 0) { @@ -387,7 +387,7 @@ static cc_uint32 cci_cc_data_array_write (cc_data **in_ccdata_array, if (!err) { for (count = 0; in_ccdata_array && in_ccdata_array[count]; count++); - err = k5_ipc_stream_write_uint32 (io_stream, count); + err = krb5int_ipc_stream_write_uint32 (io_stream, count); } if (!err) { @@ -461,11 +461,11 @@ static cc_uint32 cci_credentials_v5_read (cc_credentials_v5_t **out_v5creds, } if (!err) { - err = k5_ipc_stream_read_string (io_stream, &v5creds->client); + err = krb5int_ipc_stream_read_string (io_stream, &v5creds->client); } if (!err) { - err = k5_ipc_stream_read_string (io_stream, &v5creds->server); + err = krb5int_ipc_stream_read_string (io_stream, &v5creds->server); } if (!err) { @@ -473,27 +473,27 @@ static cc_uint32 cci_credentials_v5_read (cc_credentials_v5_t **out_v5creds, } if (!err) { - err = k5_ipc_stream_read_time (io_stream, &v5creds->authtime); + err = krb5int_ipc_stream_read_time (io_stream, &v5creds->authtime); } if (!err) { - err = k5_ipc_stream_read_time (io_stream, &v5creds->starttime); + err = krb5int_ipc_stream_read_time (io_stream, &v5creds->starttime); } if (!err) { - err = k5_ipc_stream_read_time (io_stream, &v5creds->endtime); + err = krb5int_ipc_stream_read_time (io_stream, &v5creds->endtime); } if (!err) { - err = k5_ipc_stream_read_time (io_stream, &v5creds->renew_till); + err = krb5int_ipc_stream_read_time (io_stream, &v5creds->renew_till); } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &v5creds->is_skey); + err = krb5int_ipc_stream_read_uint32 (io_stream, &v5creds->is_skey); } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &v5creds->ticket_flags); + err = krb5int_ipc_stream_read_uint32 (io_stream, &v5creds->ticket_flags); } if (!err) { @@ -533,11 +533,11 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds, if (!in_v5creds) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_string (io_stream, in_v5creds->client); + err = krb5int_ipc_stream_write_string (io_stream, in_v5creds->client); } if (!err) { - err = k5_ipc_stream_write_string (io_stream, in_v5creds->server); + err = krb5int_ipc_stream_write_string (io_stream, in_v5creds->server); } if (!err) { @@ -545,27 +545,27 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds, } if (!err) { - err = k5_ipc_stream_write_time (io_stream, in_v5creds->authtime); + err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->authtime); } if (!err) { - err = k5_ipc_stream_write_time (io_stream, in_v5creds->starttime); + err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->starttime); } if (!err) { - err = k5_ipc_stream_write_time (io_stream, in_v5creds->endtime); + err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->endtime); } if (!err) { - err = k5_ipc_stream_write_time (io_stream, in_v5creds->renew_till); + err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->renew_till); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_v5creds->is_skey); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_v5creds->is_skey); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_v5creds->ticket_flags); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_v5creds->ticket_flags); } if (!err) { @@ -629,7 +629,7 @@ cc_uint32 cci_credentials_union_read (cc_credentials_union **out_credentials_uni } if (!err) { - err = k5_ipc_stream_read_uint32 (io_stream, &credentials_union->version); + err = krb5int_ipc_stream_read_uint32 (io_stream, &credentials_union->version); } if (!err) { @@ -668,7 +668,7 @@ cc_uint32 cci_credentials_union_write (const cc_credentials_union *in_credential if (!in_credentials_union) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_stream, in_credentials_union->version); + err = krb5int_ipc_stream_write_uint32 (io_stream, in_credentials_union->version); } if (!err) { diff --git a/src/ccapi/common/cci_identifier.c b/src/ccapi/common/cci_identifier.c index 5ca962f..a027c70 100644 --- a/src/ccapi/common/cci_identifier.c +++ b/src/ccapi/common/cci_identifier.c @@ -252,19 +252,19 @@ cc_uint32 cci_identifier_read (cci_identifier_t *out_identifier, if (!io_stream ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_string (io_stream, &server_id); + err = krb5int_ipc_stream_read_string (io_stream, &server_id); } if (!err) { - err = k5_ipc_stream_read_string (io_stream, &object_id); + err = krb5int_ipc_stream_read_string (io_stream, &object_id); } if (!err) { err = cci_identifier_alloc (out_identifier, server_id, object_id); } - k5_ipc_stream_free_string (server_id); - k5_ipc_stream_free_string (object_id); + krb5int_ipc_stream_free_string (server_id); + krb5int_ipc_stream_free_string (object_id); return cci_check_error (err); } @@ -280,11 +280,11 @@ cc_uint32 cci_identifier_write (cci_identifier_t in_identifier, if (!io_stream ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_string (io_stream, in_identifier->server_id); + err = krb5int_ipc_stream_write_string (io_stream, in_identifier->server_id); } if (!err) { - err = k5_ipc_stream_write_string (io_stream, in_identifier->object_id); + err = krb5int_ipc_stream_write_string (io_stream, in_identifier->object_id); } return cci_check_error (err); diff --git a/src/ccapi/common/cci_message.c b/src/ccapi/common/cci_message.c index b541558..0e12c0d 100644 --- a/src/ccapi/common/cci_message.c +++ b/src/ccapi/common/cci_message.c @@ -67,11 +67,11 @@ cc_int32 cci_message_new_request_header (k5_ipc_stream *out_request, if (!out_request) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_request_name); + err = krb5int_ipc_stream_write_uint32 (request, in_request_name); } if (!err) { @@ -83,7 +83,7 @@ cc_int32 cci_message_new_request_header (k5_ipc_stream *out_request, request = NULL; } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -103,7 +103,7 @@ cc_int32 cci_message_read_request_header (k5_ipc_stream in_request, if (!out_identifier ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request, &request_name); + err = krb5int_ipc_stream_read_uint32 (in_request, &request_name); } if (!err) { @@ -132,11 +132,11 @@ cc_int32 cci_message_new_reply_header (k5_ipc_stream *out_reply, if (!out_reply) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&reply); + err = krb5int_ipc_stream_new (&reply); } if (!err) { - err = k5_ipc_stream_write_int32 (reply, in_error); + err = krb5int_ipc_stream_write_int32 (reply, in_error); } if (!err) { @@ -144,7 +144,7 @@ cc_int32 cci_message_new_reply_header (k5_ipc_stream *out_reply, reply = NULL; } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -161,7 +161,7 @@ cc_int32 cci_message_read_reply_header (k5_ipc_stream in_reply, if (!out_reply_error) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_int32 (in_reply, &reply_err); + err = krb5int_ipc_stream_read_int32 (in_reply, &reply_err); } if (!err) { @@ -177,7 +177,7 @@ cc_int32 cci_message_read_reply_header (k5_ipc_stream in_reply, /* ------------------------------------------------------------------------ */ -uint32_t k5_ipc_stream_read_time (k5_ipc_stream io_stream, +uint32_t krb5int_ipc_stream_read_time (k5_ipc_stream io_stream, cc_time_t *out_time) { int32_t err = 0; @@ -187,7 +187,7 @@ uint32_t k5_ipc_stream_read_time (k5_ipc_stream io_stream, if (!out_time ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_int64 (io_stream, &t); + err = krb5int_ipc_stream_read_int64 (io_stream, &t); } if (!err) { @@ -199,15 +199,15 @@ uint32_t k5_ipc_stream_read_time (k5_ipc_stream io_stream, /* ------------------------------------------------------------------------ */ -uint32_t k5_ipc_stream_write_time (k5_ipc_stream io_stream, - cc_time_t in_time) +uint32_t krb5int_ipc_stream_write_time (k5_ipc_stream io_stream, + cc_time_t in_time) { int32_t err = 0; if (!io_stream) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_int64 (io_stream, in_time); + err = krb5int_ipc_stream_write_int64 (io_stream, in_time); } return cci_check_error (err); diff --git a/src/ccapi/common/cci_message.h b/src/ccapi/common/cci_message.h index 27ed9c1..8c1795b 100644 --- a/src/ccapi/common/cci_message.h +++ b/src/ccapi/common/cci_message.h @@ -45,9 +45,9 @@ cc_int32 cci_message_new_reply_header (k5_ipc_stream *out_reply, cc_int32 cci_message_read_reply_header (k5_ipc_stream in_reply, cc_int32 *out_reply_error); -uint32_t k5_ipc_stream_read_time (k5_ipc_stream io_stream, - cc_time_t *out_time); -uint32_t k5_ipc_stream_write_time (k5_ipc_stream io_stream, - cc_time_t in_time); +uint32_t krb5int_ipc_stream_read_time (k5_ipc_stream io_stream, + cc_time_t *out_time); +uint32_t krb5int_ipc_stream_write_time (k5_ipc_stream io_stream, + cc_time_t in_time); #endif /* CCI_MESSAGE_H */ diff --git a/src/ccapi/lib/ccapi_ccache.c b/src/ccapi/lib/ccapi_ccache.c index 57c6f83..ec64c44 100644 --- a/src/ccapi/lib/ccapi_ccache.c +++ b/src/ccapi/lib/ccapi_ccache.c @@ -221,10 +221,10 @@ cc_int32 ccapi_ccache_get_credentials_version (cc_ccache_t in_ccache, } if (!err) { - err = k5_ipc_stream_read_uint32 (reply, out_credentials_version); + err = krb5int_ipc_stream_read_uint32 (reply, out_credentials_version); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -250,15 +250,15 @@ cc_int32 ccapi_ccache_get_name (cc_ccache_t in_ccache, } if (!err) { - err = k5_ipc_stream_read_string (reply, &name); + err = krb5int_ipc_stream_read_string (reply, &name); } if (!err) { err = cci_string_new (out_name, name); } - k5_ipc_stream_release (reply); - k5_ipc_stream_free_string (name); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_free_string (name); return cci_check_error (err); } @@ -279,11 +279,11 @@ cc_int32 ccapi_ccache_get_principal (cc_ccache_t in_ccache, if (!out_principal) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_credentials_version); + err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version); } if (!err) { @@ -294,16 +294,16 @@ cc_int32 ccapi_ccache_get_principal (cc_ccache_t in_ccache, } if (!err) { - err = k5_ipc_stream_read_string (reply, &principal); + err = krb5int_ipc_stream_read_string (reply, &principal); } if (!err) { err = cci_string_new (out_principal, principal); } - k5_ipc_stream_release (request); - k5_ipc_stream_release (reply); - k5_ipc_stream_free_string (principal); + krb5int_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_free_string (principal); return cci_check_error (err); } @@ -322,15 +322,15 @@ cc_int32 ccapi_ccache_set_principal (cc_ccache_t io_ccache, if (!in_principal) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_credentials_version); + err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version); } if (!err) { - err = k5_ipc_stream_write_string (request, in_principal); + err = krb5int_ipc_stream_write_string (request, in_principal); } if (!err) { @@ -340,7 +340,7 @@ cc_int32 ccapi_ccache_set_principal (cc_ccache_t io_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -358,7 +358,7 @@ cc_int32 ccapi_ccache_store_credentials (cc_ccache_t io_ccache, if (!in_credentials_union) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { @@ -372,7 +372,7 @@ cc_int32 ccapi_ccache_store_credentials (cc_ccache_t io_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -390,7 +390,7 @@ cc_int32 ccapi_ccache_remove_credentials (cc_ccache_t io_ccache, if (!in_credentials) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { @@ -404,7 +404,7 @@ cc_int32 ccapi_ccache_remove_credentials (cc_ccache_t io_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -437,7 +437,7 @@ cc_int32 ccapi_ccache_new_credentials_iterator (cc_ccache_t in_cc err = cci_credentials_iterator_new (out_credentials_iterator, identifier); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); cci_identifier_release (identifier); return cci_check_error (err); @@ -459,7 +459,7 @@ cc_int32 ccapi_ccache_move (cc_ccache_t io_source_ccache, if (!io_destination_ccache) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { @@ -473,7 +473,7 @@ cc_int32 ccapi_ccache_move (cc_ccache_t io_source_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -491,15 +491,15 @@ cc_int32 ccapi_ccache_lock (cc_ccache_t io_ccache, if (!io_ccache) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_lock_type); + err = krb5int_ipc_stream_write_uint32 (request, in_lock_type); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_block); + err = krb5int_ipc_stream_write_uint32 (request, in_block); } if (!err) { @@ -509,7 +509,7 @@ cc_int32 ccapi_ccache_lock (cc_ccache_t io_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -553,10 +553,10 @@ cc_int32 ccapi_ccache_get_last_default_time (cc_ccache_t in_ccache, } if (!err) { - err = k5_ipc_stream_read_time (reply, out_last_default_time); + err = krb5int_ipc_stream_read_time (reply, out_last_default_time); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -581,10 +581,10 @@ cc_int32 ccapi_ccache_get_change_time (cc_ccache_t in_ccache, } if (!err) { - err = k5_ipc_stream_read_time (reply, out_change_time); + err = krb5int_ipc_stream_read_time (reply, out_change_time); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -601,11 +601,11 @@ cc_int32 ccapi_ccache_wait_for_change (cc_ccache_t in_ccache) if (!in_ccache) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_time (request, ccache->last_wait_for_change_time); + err = krb5int_ipc_stream_write_time (request, ccache->last_wait_for_change_time); } if (!err) { @@ -616,11 +616,11 @@ cc_int32 ccapi_ccache_wait_for_change (cc_ccache_t in_ccache) } if (!err) { - err = k5_ipc_stream_read_time (reply, &ccache->last_wait_for_change_time); + err = krb5int_ipc_stream_read_time (reply, &ccache->last_wait_for_change_time); } - k5_ipc_stream_release (request); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -663,11 +663,11 @@ cc_int32 ccapi_ccache_get_kdc_time_offset (cc_ccache_t in_ccache, if (!out_time_offset) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_credentials_version); + err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version); } if (!err) { @@ -678,11 +678,11 @@ cc_int32 ccapi_ccache_get_kdc_time_offset (cc_ccache_t in_ccache, } if (!err) { - err = k5_ipc_stream_read_time (reply, out_time_offset); + err = krb5int_ipc_stream_read_time (reply, out_time_offset); } - k5_ipc_stream_release (request); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -700,15 +700,15 @@ cc_int32 ccapi_ccache_set_kdc_time_offset (cc_ccache_t io_ccache, if (!io_ccache) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_credentials_version); + err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version); } if (!err) { - err = k5_ipc_stream_write_time (request, in_time_offset); + err = krb5int_ipc_stream_write_time (request, in_time_offset); } if (!err) { @@ -718,7 +718,7 @@ cc_int32 ccapi_ccache_set_kdc_time_offset (cc_ccache_t io_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -735,11 +735,11 @@ cc_int32 ccapi_ccache_clear_kdc_time_offset (cc_ccache_t io_ccache, if (!io_ccache) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_credentials_version); + err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version); } if (!err) { @@ -749,7 +749,7 @@ cc_int32 ccapi_ccache_clear_kdc_time_offset (cc_ccache_t io_ccache, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } diff --git a/src/ccapi/lib/ccapi_ccache_iterator.c b/src/ccapi/lib/ccapi_ccache_iterator.c index 0f5d241..0df9e0f 100644 --- a/src/ccapi/lib/ccapi_ccache_iterator.c +++ b/src/ccapi/lib/ccapi_ccache_iterator.c @@ -193,7 +193,7 @@ cc_int32 ccapi_ccache_iterator_next (cc_ccache_iterator_t in_ccache_iterator, err = cci_ccache_new (out_ccache, identifier); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); cci_identifier_release (identifier); return cci_check_error (err); @@ -240,7 +240,7 @@ cc_int32 ccapi_ccache_iterator_clone (cc_ccache_iterator_t in_ccache_iterator, } cci_identifier_release (identifier); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c index 7ba3db4..9b1d05d 100644 --- a/src/ccapi/lib/ccapi_context.c +++ b/src/ccapi/lib/ccapi_context.c @@ -247,11 +247,11 @@ cc_int32 ccapi_context_get_change_time (cc_context_t in_context, NULL, &reply); } - if (!err && k5_ipc_stream_size (reply) > 0) { + if (!err && krb5int_ipc_stream_size (reply) > 0) { cc_time_t change_time = 0; /* got a response from the server */ - err = k5_ipc_stream_read_time (reply, &change_time); + err = krb5int_ipc_stream_read_time (reply, &change_time); if (!err) { err = cci_context_change_time_update (context->identifier, @@ -263,7 +263,7 @@ cc_int32 ccapi_context_get_change_time (cc_context_t in_context, err = cci_context_change_time_get (out_change_time); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -280,11 +280,11 @@ cc_int32 ccapi_context_wait_for_change (cc_context_t in_context) if (!in_context) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_time (request, context->last_wait_for_change_time); + err = krb5int_ipc_stream_write_time (request, context->last_wait_for_change_time); } if (!err) { @@ -299,11 +299,11 @@ cc_int32 ccapi_context_wait_for_change (cc_context_t in_context) } if (!err) { - err = k5_ipc_stream_read_time (reply, &context->last_wait_for_change_time); + err = krb5int_ipc_stream_read_time (reply, &context->last_wait_for_change_time); } - k5_ipc_stream_release (request); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -334,9 +334,9 @@ cc_int32 ccapi_context_get_default_ccache_name (cc_context_t in_context, } if (!err) { - if (k5_ipc_stream_size (reply) > 0) { + if (krb5int_ipc_stream_size (reply) > 0) { /* got a response from the server */ - err = k5_ipc_stream_read_string (reply, &reply_name); + err = krb5int_ipc_stream_read_string (reply, &reply_name); if (!err) { name = reply_name; @@ -350,8 +350,8 @@ cc_int32 ccapi_context_get_default_ccache_name (cc_context_t in_context, err = cci_string_new (out_name, name); } - k5_ipc_stream_release (reply); - k5_ipc_stream_free_string (reply_name); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_free_string (reply_name); return cci_check_error (err); } @@ -373,11 +373,11 @@ cc_int32 ccapi_context_open_ccache (cc_context_t in_context, if (!out_ccache ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_string (request, in_name); + err = krb5int_ipc_stream_write_string (request, in_name); } if (!err) { @@ -391,7 +391,7 @@ cc_int32 ccapi_context_open_ccache (cc_context_t in_context, &reply); } - if (!err && !(k5_ipc_stream_size (reply) > 0)) { + if (!err && !(krb5int_ipc_stream_size (reply) > 0)) { err = ccErrCCacheNotFound; } @@ -404,8 +404,8 @@ cc_int32 ccapi_context_open_ccache (cc_context_t in_context, } cci_identifier_release (identifier); - k5_ipc_stream_release (reply); - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -434,7 +434,7 @@ cc_int32 ccapi_context_open_default_ccache (cc_context_t in_context, &reply); } - if (!err && !(k5_ipc_stream_size (reply) > 0)) { + if (!err && !(krb5int_ipc_stream_size (reply) > 0)) { err = ccErrCCacheNotFound; } @@ -447,7 +447,7 @@ cc_int32 ccapi_context_open_default_ccache (cc_context_t in_context, } cci_identifier_release (identifier); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -472,19 +472,19 @@ cc_int32 ccapi_context_create_ccache (cc_context_t in_context, if (!out_ccache ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_string (request, in_name); + err = krb5int_ipc_stream_write_string (request, in_name); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_cred_vers); + err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers); } if (!err) { - err = k5_ipc_stream_write_string (request, in_principal); + err = krb5int_ipc_stream_write_string (request, in_principal); } if (!err) { @@ -507,8 +507,8 @@ cc_int32 ccapi_context_create_ccache (cc_context_t in_context, } cci_identifier_release (identifier); - k5_ipc_stream_release (reply); - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -531,15 +531,15 @@ cc_int32 ccapi_context_create_default_ccache (cc_context_t in_context, if (!out_ccache ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_cred_vers); + err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers); } if (!err) { - err = k5_ipc_stream_write_string (request, in_principal); + err = krb5int_ipc_stream_write_string (request, in_principal); } if (!err) { @@ -562,8 +562,8 @@ cc_int32 ccapi_context_create_default_ccache (cc_context_t in_context, } cci_identifier_release (identifier); - k5_ipc_stream_release (reply); - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -586,15 +586,15 @@ cc_int32 ccapi_context_create_new_ccache (cc_context_t in_context, if (!out_ccache ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_cred_vers); + err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers); } if (!err) { - err = k5_ipc_stream_write_string (request, in_principal); + err = krb5int_ipc_stream_write_string (request, in_principal); } if (!err) { @@ -617,8 +617,8 @@ cc_int32 ccapi_context_create_new_ccache (cc_context_t in_context, } cci_identifier_release (identifier); - k5_ipc_stream_release (reply); - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -648,7 +648,7 @@ cc_int32 ccapi_context_new_ccache_iterator (cc_context_t in_context, } if (!err) { - if (k5_ipc_stream_size (reply) > 0) { + if (krb5int_ipc_stream_size (reply) > 0) { err = cci_identifier_read (&identifier, reply); } else { identifier = cci_identifier_uninitialized; @@ -659,7 +659,7 @@ cc_int32 ccapi_context_new_ccache_iterator (cc_context_t in_context, err = cci_ccache_iterator_new (out_iterator, identifier); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); cci_identifier_release (identifier); return cci_check_error (err); @@ -678,15 +678,15 @@ cc_int32 ccapi_context_lock (cc_context_t in_context, if (!in_context) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&request); + err = krb5int_ipc_stream_new (&request); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_lock_type); + err = krb5int_ipc_stream_write_uint32 (request, in_lock_type); } if (!err) { - err = k5_ipc_stream_write_uint32 (request, in_block); + err = krb5int_ipc_stream_write_uint32 (request, in_block); } if (!err) { @@ -700,7 +700,7 @@ cc_int32 ccapi_context_lock (cc_context_t in_context, NULL); } - k5_ipc_stream_release (request); + krb5int_ipc_stream_release (request); return cci_check_error (err); } @@ -795,7 +795,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context, } if (!err) { - if (k5_ipc_stream_size (reply) > 0) { + if (krb5int_ipc_stream_size (reply) > 0) { err = cci_identifier_read (&new_identifier, reply); } else { new_identifier = cci_identifier_uninitialized; @@ -827,7 +827,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context, } cci_identifier_release (new_identifier); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } diff --git a/src/ccapi/lib/ccapi_credentials_iterator.c b/src/ccapi/lib/ccapi_credentials_iterator.c index 4571b64..59ffc7c 100644 --- a/src/ccapi/lib/ccapi_credentials_iterator.c +++ b/src/ccapi/lib/ccapi_credentials_iterator.c @@ -168,7 +168,7 @@ cc_int32 ccapi_credentials_iterator_next (cc_credentials_iterator_t in_credenti err = cci_credentials_read (out_credentials, reply); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } @@ -201,7 +201,7 @@ cc_int32 ccapi_credentials_iterator_clone (cc_credentials_iterator_t in_credent err = cci_credentials_iterator_new (out_credentials_iterator, identifier); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); cci_identifier_release (identifier); return cci_check_error (err); diff --git a/src/ccapi/lib/ccapi_ipc.c b/src/ccapi/lib/ccapi_ipc.c index 43993dc..8d8b2d2 100644 --- a/src/ccapi/lib/ccapi_ipc.c +++ b/src/ccapi/lib/ccapi_ipc.c @@ -65,15 +65,15 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name, } if (!err && in_request_data) { - err = k5_ipc_stream_write (request, - k5_ipc_stream_data (in_request_data), - k5_ipc_stream_size (in_request_data)); + err = krb5int_ipc_stream_write (request, + krb5int_ipc_stream_data (in_request_data), + krb5int_ipc_stream_size (in_request_data)); } if (!err) { err = cci_os_ipc (in_launch_server, request, &reply); - if (!err && k5_ipc_stream_size (reply) > 0) { + if (!err && krb5int_ipc_stream_size (reply) > 0) { err = cci_message_read_reply_header (reply, &reply_error); } } @@ -87,8 +87,8 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name, reply = NULL; /* take ownership */ } - k5_ipc_stream_release (request); - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (request); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } diff --git a/src/ccapi/lib/win/ccapi_os_ipc.cxx b/src/ccapi/lib/win/ccapi_os_ipc.cxx index 6ccd59b..b6fc701 100644 --- a/src/ccapi/lib/win/ccapi_os_ipc.cxx +++ b/src/ccapi/lib/win/ccapi_os_ipc.cxx @@ -207,8 +207,8 @@ extern "C" cc_int32 cci_os_ipc_msg( cc_int32 in_launch_server, in_msg, /* Message type */ (unsigned char*)&ptspdata, /* Our tspdata* will be sent back to the reply proc. */ (unsigned char*)uuid, - k5_ipc_stream_size(in_request_stream), - (unsigned char*)k5_ipc_stream_data(in_request_stream), /* Data buffer */ + krb5int_ipc_stream_size(in_request_stream), + (unsigned char*)krb5int_ipc_stream_data(in_request_stream), /* Data buffer */ sst, /* session start time */ (long*)(&err) ); /* Return code */ } @@ -376,4 +376,4 @@ cc_int32 ccapi_connect(const struct tspdata* tsp) { } return status; - }
\ No newline at end of file + } diff --git a/src/ccapi/lib/win/ccs_reply_proc.c b/src/ccapi/lib/win/ccs_reply_proc.c index 8eb3408..b3ef3f7 100644 --- a/src/ccapi/lib/win/ccs_reply_proc.c +++ b/src/ccapi/lib/win/ccs_reply_proc.c @@ -53,11 +53,11 @@ void ccs_rpc_request_reply( cci_debug_printf("%s! msg#:%d SST:%ld uuid:%s", __FUNCTION__, rpcmsg, srvStartTime, uuid); #endif if (!status) { - status = k5_ipc_stream_new (&stream); /* Create a stream for the request data */ + status = krb5int_ipc_stream_new (&stream); /* Create a stream for the request data */ } if (!status) { /* Put the data into the stream */ - status = k5_ipc_stream_write (stream, chIn, cbIn); + status = krb5int_ipc_stream_write (stream, chIn, cbIn); } if (!status) { /* Put the data into the stream */ diff --git a/src/ccapi/lib/win/debug.exports b/src/ccapi/lib/win/debug.exports index d7fbcc1..7bf84d2 100644 --- a/src/ccapi/lib/win/debug.exports +++ b/src/ccapi/lib/win/debug.exports @@ -3,9 +3,9 @@ cci_os_ipc
cci_os_ipc_msg
cci_os_ipc_thread_init
- k5_ipc_stream_data
- k5_ipc_stream_write
- k5_ipc_stream_new
+ krb5int_ipc_stream_data
+ krb5int_ipc_stream_write
+ krb5int_ipc_stream_new
ccs_authenticate
diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c index 3790a10..2137e81 100644 --- a/src/ccapi/server/ccs_cache_collection.c +++ b/src/ccapi/server/ccs_cache_collection.c @@ -152,11 +152,11 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio } if (!err) { - err = k5_ipc_stream_new (&reply_data); + err = krb5int_ipc_stream_new (&reply_data); } if (!err) { - err = k5_ipc_stream_write_time (reply_data, io_cache_collection->last_changed_time); + err = krb5int_ipc_stream_write_time (reply_data, io_cache_collection->last_changed_time); } if (!err) { @@ -181,7 +181,7 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio err = ccs_os_notify_cache_collection_changed (io_cache_collection); } - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } @@ -601,7 +601,7 @@ static cc_int32 ccs_cache_collection_get_change_time (ccs_cache_collection_t io_ if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time); + err = krb5int_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time); } return cci_check_error (err); @@ -627,12 +627,12 @@ static cc_int32 ccs_cache_collection_wait_for_change (ccs_pipe_t in if (!out_will_block ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_time (in_request_data, &last_wait_for_change_time); + err = krb5int_ipc_stream_read_time (in_request_data, &last_wait_for_change_time); } if (!err) { if (last_wait_for_change_time < io_cache_collection->last_changed_time) { - err = k5_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time); + err = krb5int_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time); } else { ccs_callback_t callback = NULL; @@ -690,7 +690,7 @@ static cc_int32 ccs_cache_collection_get_default_ccache_name (ccs_cache_collecti err = ccs_ccache_write_name (ccache, io_reply_data); } } else { - err = k5_ipc_stream_write_string (io_reply_data, + err = krb5int_ipc_stream_write_string (io_reply_data, k_cci_context_initial_ccache_name); } } @@ -713,7 +713,7 @@ static cc_int32 ccs_cache_collection_open_ccache (ccs_cache_collection_t io_cach if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_string (in_request_data, &name); + err = krb5int_ipc_stream_read_string (in_request_data, &name); } if (!err) { @@ -725,7 +725,7 @@ static cc_int32 ccs_cache_collection_open_ccache (ccs_cache_collection_t io_cach err = ccs_ccache_write (ccache, io_reply_data); } - k5_ipc_stream_free_string (name); + krb5int_ipc_stream_free_string (name); return cci_check_error (err); } @@ -772,15 +772,15 @@ static cc_int32 ccs_cache_collection_create_ccache (ccs_cache_collection_t io_ca if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_string (in_request_data, &name); + err = krb5int_ipc_stream_read_string (in_request_data, &name); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers); } if (!err) { - err = k5_ipc_stream_read_string (in_request_data, &principal); + err = krb5int_ipc_stream_read_string (in_request_data, &principal); } if (!err) { @@ -805,8 +805,8 @@ static cc_int32 ccs_cache_collection_create_ccache (ccs_cache_collection_t io_ca err = ccs_cache_collection_changed (io_cache_collection); } - k5_ipc_stream_free_string (name); - k5_ipc_stream_free_string (principal); + krb5int_ipc_stream_free_string (name); + krb5int_ipc_stream_free_string (principal); return cci_check_error (err); } @@ -827,11 +827,11 @@ static cc_int32 ccs_cache_collection_create_default_ccache (ccs_cache_collection if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers); } if (!err) { - err = k5_ipc_stream_read_string (in_request_data, &principal); + err = krb5int_ipc_stream_read_string (in_request_data, &principal); } if (!err) { @@ -864,7 +864,7 @@ static cc_int32 ccs_cache_collection_create_default_ccache (ccs_cache_collection err = ccs_cache_collection_changed (io_cache_collection); } - k5_ipc_stream_free_string (principal); + krb5int_ipc_stream_free_string (principal); return cci_check_error (err); } @@ -886,11 +886,11 @@ static cc_int32 ccs_cache_collection_create_new_ccache (ccs_cache_collection_t i if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers); } if (!err) { - err = k5_ipc_stream_read_string (in_request_data, &principal); + err = krb5int_ipc_stream_read_string (in_request_data, &principal); } if (!err) { @@ -912,7 +912,7 @@ static cc_int32 ccs_cache_collection_create_new_ccache (ccs_cache_collection_t i } free (name); - k5_ipc_stream_free_string (principal); + krb5int_ipc_stream_free_string (principal); return cci_check_error (err); } @@ -964,11 +964,11 @@ static cc_int32 ccs_cache_collection_lock (ccs_pipe_t in_client_pip if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &lock_type); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &lock_type); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &block); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &block); } if (!err) { @@ -1028,7 +1028,7 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t in_client_pi if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&reply_data); + err = krb5int_ipc_stream_new (&reply_data); } if (!err) { @@ -1104,7 +1104,7 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t in_client_pi } } - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c index 88cf1e0..d766234 100644 --- a/src/ccapi/server/ccs_ccache.c +++ b/src/ccapi/server/ccs_ccache.c @@ -335,11 +335,11 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t io_ccache, } if (!err) { - err = k5_ipc_stream_new (&reply_data); + err = krb5int_ipc_stream_new (&reply_data); } if (!err) { - err = k5_ipc_stream_write_time (reply_data, io_ccache->last_changed_time); + err = krb5int_ipc_stream_write_time (reply_data, io_ccache->last_changed_time); } if (!err) { @@ -365,7 +365,7 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t io_ccache, io_ccache->name); } - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } @@ -487,7 +487,7 @@ cc_int32 ccs_ccache_write_name (ccs_ccache_t in_ccache, if (!io_stream) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_string (io_stream, in_ccache->name); + err = krb5int_ipc_stream_write_string (io_stream, in_ccache->name); } return cci_check_error (err); @@ -562,7 +562,7 @@ static cc_int32 ccs_ccache_get_credentials_version (ccs_ccache_t io_cc if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_uint32 (io_reply_data, io_ccache->creds_version); + err = krb5int_ipc_stream_write_uint32 (io_reply_data, io_ccache->creds_version); } return cci_check_error (err); @@ -583,7 +583,7 @@ static cc_int32 ccs_ccache_get_name (ccs_ccache_t io_ccache, if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_string (io_reply_data, io_ccache->name); + err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->name); } return cci_check_error (err); @@ -605,7 +605,7 @@ static cc_int32 ccs_ccache_get_principal (ccs_ccache_t io_ccache, if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &version); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &version); } if (!err && version == cc_credentials_v4_v5) { @@ -614,10 +614,10 @@ static cc_int32 ccs_ccache_get_principal (ccs_ccache_t io_ccache, if (!err) { if (version == cc_credentials_v4) { - err = k5_ipc_stream_write_string (io_reply_data, io_ccache->v4_principal); + err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->v4_principal); } else if (version == cc_credentials_v5) { - err = k5_ipc_stream_write_string (io_reply_data, io_ccache->v5_principal); + err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->v5_principal); } else { err = cci_check_error (ccErrBadCredentialsVersion); @@ -644,11 +644,11 @@ static cc_int32 ccs_ccache_set_principal (ccs_ccache_t io_ccache, if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &version); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &version); } if (!err) { - err = k5_ipc_stream_read_string (in_request_data, &principal); + err = krb5int_ipc_stream_read_string (in_request_data, &principal); } if (!err) { @@ -681,7 +681,7 @@ static cc_int32 ccs_ccache_set_principal (ccs_ccache_t io_ccache, err = ccs_ccache_changed (io_ccache, io_cache_collection); } - k5_ipc_stream_free_string (principal); + krb5int_ipc_stream_free_string (principal); return cci_check_error (err); } @@ -834,11 +834,11 @@ static cc_int32 ccs_ccache_lock (ccs_pipe_t in_client_pipe, if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &lock_type); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &lock_type); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &block); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &block); } if (!err) { @@ -892,7 +892,7 @@ static cc_int32 ccs_ccache_get_last_default_time (ccs_ccache_t io_ccac } if (!err) { - err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_default_time); + err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_default_time); } return cci_check_error (err); @@ -913,7 +913,7 @@ static cc_int32 ccs_ccache_get_change_time (ccs_ccache_t io_ccache, if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time); + err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time); } return cci_check_error (err); @@ -941,13 +941,13 @@ static cc_int32 ccs_ccache_wait_for_change (ccs_pipe_t in_client_pi if (!out_will_block ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_time (in_request_data, &last_wait_for_change_time); + err = krb5int_ipc_stream_read_time (in_request_data, &last_wait_for_change_time); } if (!err) { if (last_wait_for_change_time < io_ccache->last_changed_time) { cci_debug_printf ("%s returning immediately", __FUNCTION__); - err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time); + err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time); } else { ccs_callback_t callback = NULL; @@ -995,20 +995,20 @@ static cc_int32 ccs_ccache_get_kdc_time_offset (ccs_ccache_t io_ccache if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers); } if (!err) { if (cred_vers == cc_credentials_v4) { if (io_ccache->kdc_time_offset_v4_valid) { - err = k5_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v4); + err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v4); } else { err = cci_check_error (ccErrTimeOffsetNotSet); } } else if (cred_vers == cc_credentials_v5) { if (io_ccache->kdc_time_offset_v5_valid) { - err = k5_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v5); + err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v5); } else { err = cci_check_error (ccErrTimeOffsetNotSet); } @@ -1037,18 +1037,18 @@ static cc_int32 ccs_ccache_set_kdc_time_offset (ccs_ccache_t io_ccache if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers); } if (!err) { if (cred_vers == cc_credentials_v4) { - err = k5_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v4); + err = krb5int_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v4); if (!err) { io_ccache->kdc_time_offset_v4_valid = 1; } } else if (cred_vers == cc_credentials_v5) { - err = k5_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v5); + err = krb5int_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v5); if (!err) { io_ccache->kdc_time_offset_v5_valid = 1; @@ -1081,7 +1081,7 @@ static cc_int32 ccs_ccache_clear_kdc_time_offset (ccs_ccache_t io_ccac if (!io_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers); + err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers); } if (!err) { @@ -1132,7 +1132,7 @@ cc_int32 ccs_ccache_handle_message (ccs_pipe_t in_client_pipe, if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&reply_data); + err = krb5int_ipc_stream_new (&reply_data); } if (!err) { @@ -1231,7 +1231,7 @@ cc_int32 ccs_ccache_handle_message (ccs_pipe_t in_client_pipe, } } - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } diff --git a/src/ccapi/server/ccs_ccache_iterator.c b/src/ccapi/server/ccs_ccache_iterator.c index 0e05056..fb007bf 100644 --- a/src/ccapi/server/ccs_ccache_iterator.c +++ b/src/ccapi/server/ccs_ccache_iterator.c @@ -119,7 +119,7 @@ static cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t io_ccache_ite if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&reply_data); + err = krb5int_ipc_stream_new (&reply_data); } if (!err) { @@ -151,7 +151,7 @@ static cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t io_ccache_ite reply_data = NULL; /* take ownership */ } - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } diff --git a/src/ccapi/server/ccs_credentials_iterator.c b/src/ccapi/server/ccs_credentials_iterator.c index 38e323c..3ca7eee 100644 --- a/src/ccapi/server/ccs_credentials_iterator.c +++ b/src/ccapi/server/ccs_credentials_iterator.c @@ -121,7 +121,7 @@ static cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); } if (!err) { - err = k5_ipc_stream_new (&reply_data); + err = krb5int_ipc_stream_new (&reply_data); } if (!err) { @@ -153,7 +153,7 @@ static cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c reply_data = NULL; /* take ownership */ } - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } diff --git a/src/ccapi/server/ccs_server.c b/src/ccapi/server/ccs_server.c index c1bbe53..30476e4 100644 --- a/src/ccapi/server/ccs_server.c +++ b/src/ccapi/server/ccs_server.c @@ -366,7 +366,7 @@ cc_int32 ccs_server_handle_request (ccs_pipe_t in_client_pipe, } cci_identifier_release (request_identifier); - k5_ipc_stream_release (reply_data); + krb5int_ipc_stream_release (reply_data); return cci_check_error (err); } @@ -386,17 +386,17 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t in_reply_pipe, err = cci_message_new_reply_header (&reply, in_reply_err); } - if (!err && in_reply_data && k5_ipc_stream_size (in_reply_data) > 0) { - err = k5_ipc_stream_write (reply, - k5_ipc_stream_data (in_reply_data), - k5_ipc_stream_size (in_reply_data)); + if (!err && in_reply_data && krb5int_ipc_stream_size (in_reply_data) > 0) { + err = krb5int_ipc_stream_write (reply, + krb5int_ipc_stream_data (in_reply_data), + krb5int_ipc_stream_size (in_reply_data)); } if (!err) { err = ccs_os_server_send_reply (in_reply_pipe, reply); } - k5_ipc_stream_release (reply); + krb5int_ipc_stream_release (reply); return cci_check_error (err); } diff --git a/src/ccapi/server/win/WorkItem.cpp b/src/ccapi/server/win/WorkItem.cpp index 2e9ebcc..1b1725a 100644 --- a/src/ccapi/server/win/WorkItem.cpp +++ b/src/ccapi/server/win/WorkItem.cpp @@ -53,17 +53,17 @@ WorkItem::WorkItem(k5_ipc_stream buf, WIN_PIPE* pipe, const long type, const lon WorkItem::WorkItem(const WorkItem& item) : _buf(NULL), _rpcmsg(0), _pipe(NULL), _sst(0) {
k5_ipc_stream _buf = NULL;
- k5_ipc_stream_new(&_buf);
- k5_ipc_stream_write(_buf,
- k5_ipc_stream_data(item.payload()),
- k5_ipc_stream_size(item.payload()) );
+ krb5int_ipc_stream_new(&_buf);
+ krb5int_ipc_stream_write(_buf,
+ krb5int_ipc_stream_data(item.payload()),
+ krb5int_ipc_stream_size(item.payload()) );
WorkItem(_buf, item._pipe, item._rpcmsg, item._sst);
}
WorkItem::WorkItem() : _buf(NULL), _rpcmsg(CCMSG_INVALID), _pipe(NULL), _sst(0) { }
WorkItem::~WorkItem() {
- if (_buf) k5_ipc_stream_release(_buf);
+ if (_buf) krb5int_ipc_stream_release(_buf);
if (_pipe) ccs_win_pipe_release(_pipe);
}
@@ -123,4 +123,4 @@ int WorkList::remove(WorkItem** item) { }
return !bEmpty;
- }
\ No newline at end of file + }
diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp index 99854d1..e80a1c3 100644 --- a/src/ccapi/server/win/ccs_os_server.cpp +++ b/src/ccapi/server/win/ccs_os_server.cpp @@ -279,8 +279,8 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) { break;
case CCMSG_PING:
cci_debug_printf(" Processing PING");
- err = k5_ipc_stream_new (&stream);
- err = k5_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);
+ err = krb5int_ipc_stream_new (&stream);
+ err = krb5int_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);
err = ccs_os_server_send_reply(pipe, stream);
break;
default:
@@ -288,7 +288,7 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) { rpcmsg, uuid);
break;
}
- if (buf) k5_ipc_stream_release(buf);
+ if (buf) krb5int_ipc_stream_release(buf);
/* Don't free uuid, which was allocated here. A pointer to it is in the
rpcargs struct which was passed to connectionListener which will be
received by ccapi_listen when the client exits. ccapi_listen needs
@@ -333,8 +333,8 @@ cc_int32 ccs_os_server_send_reply (ccs_pipe_t in_pipe, (unsigned char*)&h, /* client's tspdata* */
(unsigned char*)uuid,
getMySST(),
- k5_ipc_stream_size(in_reply_stream), /* Length of buffer */
- (const unsigned char*)k5_ipc_stream_data(in_reply_stream), /* Data buffer */
+ krb5int_ipc_stream_size(in_reply_stream), /* Length of buffer */
+ (const unsigned char*)krb5int_ipc_stream_data(in_reply_stream), /* Data buffer */
&status ); /* Return code */
}
RpcExcept(1) {
diff --git a/src/ccapi/server/win/ccs_request_proc.c b/src/ccapi/server/win/ccs_request_proc.c index 8a0da03..8421b72 100644 --- a/src/ccapi/server/win/ccs_request_proc.c +++ b/src/ccapi/server/win/ccs_request_proc.c @@ -52,11 +52,11 @@ void ccs_rpc_request( status = (rpcmsg != CCMSG_REQUEST) && (rpcmsg != CCMSG_PING); if (!status) { - status = k5_ipc_stream_new (&stream); /* Create a stream for the request data */ + status = krb5int_ipc_stream_new (&stream); /* Create a stream for the request data */ } if (!status) { /* Put the data into the stream */ - status = k5_ipc_stream_write (stream, pbRequest, lenRequest); + status = krb5int_ipc_stream_write (stream, pbRequest, lenRequest); } pipe = ccs_win_pipe_new(pszUUID, *p); @@ -112,4 +112,4 @@ CC_UINT32 ccs_authenticate(const CC_CHAR* name) { if (hMap) CloseHandle(hMap); return result; - }
\ No newline at end of file + } |