rename send parameter to send_data
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10897 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -238,7 +238,7 @@ init_port(const char *s, int fallback)
|
|||||||
static int
|
static int
|
||||||
send_via_proxy (krb5_context context,
|
send_via_proxy (krb5_context context,
|
||||||
const krb5_krbhst_info *hi,
|
const krb5_krbhst_info *hi,
|
||||||
const krb5_data *send,
|
const krb5_data *send_data,
|
||||||
krb5_data *receive)
|
krb5_data *receive)
|
||||||
{
|
{
|
||||||
char *proxy2 = strdup(context->http_proxy);
|
char *proxy2 = strdup(context->http_proxy);
|
||||||
@@ -291,7 +291,7 @@ send_via_proxy (krb5_context context,
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
ret = send_and_recv_http(s, context->kdc_timeout,
|
ret = send_and_recv_http(s, context->kdc_timeout,
|
||||||
prefix, send, receive);
|
prefix, send_data, receive);
|
||||||
close (s);
|
close (s);
|
||||||
free(prefix);
|
free(prefix);
|
||||||
if(ret == 0 && receive->length != 0)
|
if(ret == 0 && receive->length != 0)
|
||||||
@@ -306,7 +306,7 @@ send_via_proxy (krb5_context context,
|
|||||||
|
|
||||||
krb5_error_code
|
krb5_error_code
|
||||||
krb5_sendto (krb5_context context,
|
krb5_sendto (krb5_context context,
|
||||||
const krb5_data *send,
|
const krb5_data *send_data,
|
||||||
krb5_krbhst_handle handle,
|
krb5_krbhst_handle handle,
|
||||||
krb5_data *receive)
|
krb5_data *receive)
|
||||||
{
|
{
|
||||||
@@ -322,7 +322,7 @@ krb5_sendto (krb5_context context,
|
|||||||
struct addrinfo *ai, *a;
|
struct addrinfo *ai, *a;
|
||||||
|
|
||||||
if(hi->proto == KRB5_KRBHST_HTTP && context->http_proxy) {
|
if(hi->proto == KRB5_KRBHST_HTTP && context->http_proxy) {
|
||||||
if (send_via_proxy (context, hi, send, receive))
|
if (send_via_proxy (context, hi, send_data, receive))
|
||||||
continue;
|
continue;
|
||||||
else
|
else
|
||||||
goto out;
|
goto out;
|
||||||
@@ -343,15 +343,15 @@ krb5_sendto (krb5_context context,
|
|||||||
switch (hi->proto) {
|
switch (hi->proto) {
|
||||||
case KRB5_KRBHST_HTTP :
|
case KRB5_KRBHST_HTTP :
|
||||||
ret = send_and_recv_http(fd, context->kdc_timeout,
|
ret = send_and_recv_http(fd, context->kdc_timeout,
|
||||||
"", send, receive);
|
"", send_data, receive);
|
||||||
break;
|
break;
|
||||||
case KRB5_KRBHST_TCP :
|
case KRB5_KRBHST_TCP :
|
||||||
ret = send_and_recv_tcp (fd, context->kdc_timeout,
|
ret = send_and_recv_tcp (fd, context->kdc_timeout,
|
||||||
send, receive);
|
send_data, receive);
|
||||||
break;
|
break;
|
||||||
case KRB5_KRBHST_UDP :
|
case KRB5_KRBHST_UDP :
|
||||||
ret = send_and_recv_udp (fd, context->kdc_timeout,
|
ret = send_and_recv_udp (fd, context->kdc_timeout,
|
||||||
send, receive);
|
send_data, receive);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
close (fd);
|
close (fd);
|
||||||
@@ -369,7 +369,7 @@ out:
|
|||||||
|
|
||||||
krb5_error_code
|
krb5_error_code
|
||||||
krb5_sendto_kdc2(krb5_context context,
|
krb5_sendto_kdc2(krb5_context context,
|
||||||
const krb5_data *send,
|
const krb5_data *send_data,
|
||||||
const krb5_realm *realm,
|
const krb5_realm *realm,
|
||||||
krb5_data *receive,
|
krb5_data *receive,
|
||||||
krb5_boolean master)
|
krb5_boolean master)
|
||||||
@@ -387,7 +387,7 @@ krb5_sendto_kdc2(krb5_context context,
|
|||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = krb5_sendto(context, send, handle, receive);
|
ret = krb5_sendto(context, send_data, handle, receive);
|
||||||
krb5_krbhst_free(context, handle);
|
krb5_krbhst_free(context, handle);
|
||||||
if (ret == KRB5_KDC_UNREACH)
|
if (ret == KRB5_KDC_UNREACH)
|
||||||
krb5_set_error_string(context,
|
krb5_set_error_string(context,
|
||||||
@@ -397,9 +397,9 @@ krb5_sendto_kdc2(krb5_context context,
|
|||||||
|
|
||||||
krb5_error_code
|
krb5_error_code
|
||||||
krb5_sendto_kdc(krb5_context context,
|
krb5_sendto_kdc(krb5_context context,
|
||||||
const krb5_data *send,
|
const krb5_data *send_data,
|
||||||
const krb5_realm *realm,
|
const krb5_realm *realm,
|
||||||
krb5_data *receive)
|
krb5_data *receive)
|
||||||
{
|
{
|
||||||
return krb5_sendto_kdc2(context, send, realm, receive, FALSE);
|
return krb5_sendto_kdc2(context, send_data, realm, receive, FALSE);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user