less leaks

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3833 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-11-09 01:18:20 +00:00
parent c1dbb62b5d
commit af364bca96
10 changed files with 139 additions and 116 deletions

View File

@@ -82,107 +82,114 @@ krb5_sendauth(krb5_context context,
krb5_ap_rep_enc_part **rep_result,
krb5_creds **out_creds)
{
krb5_error_code ret;
int fd = *((int *)p_fd);
u_int32_t len, net_len;
const char *version = KRB5_SENDAUTH_VERSION;
u_char repl;
krb5_data ap_req, error_data;
krb5_creds this_cred;
krb5_creds *creds;
krb5_error_code ret;
int fd = *((int *)p_fd);
u_int32_t len, net_len;
const char *version = KRB5_SENDAUTH_VERSION;
u_char repl;
krb5_data ap_req, error_data;
krb5_creds this_cred;
krb5_principal this_client = NULL;
krb5_creds *creds;
len = strlen(version) + 1;
net_len = htonl(len);
if (krb5_net_write (context, fd, &net_len, 4) != 4
|| krb5_net_write (context, fd, version, len) != len)
return errno;
len = strlen(version) + 1;
net_len = htonl(len);
if (krb5_net_write (context, fd, &net_len, 4) != 4
|| krb5_net_write (context, fd, version, len) != len)
return errno;
len = strlen(appl_version) + 1;
net_len = htonl(len);
if (krb5_net_write (context, fd, &net_len, 4) != 4
|| krb5_net_write (context, fd, appl_version, len) != len)
return errno;
len = strlen(appl_version) + 1;
net_len = htonl(len);
if (krb5_net_write (context, fd, &net_len, 4) != 4
|| krb5_net_write (context, fd, appl_version, len) != len)
return errno;
if (krb5_net_read (context, fd, &repl, sizeof(repl)) != sizeof(repl))
return errno;
if (krb5_net_read (context, fd, &repl, sizeof(repl)) != sizeof(repl))
return errno;
if (repl != 0)
return KRB5_SENDAUTH_BADRESPONSE; /* XXX */
if (repl != 0)
return KRB5_SENDAUTH_BADRESPONSE; /* XXX */
if (in_creds == NULL) {
if (client == NULL) {
ret = krb5_cc_get_principal (context, ccache, &client);
if (ret)
return ret;
if (in_creds == NULL) {
if (client == NULL) {
ret = krb5_cc_get_principal (context, ccache, &this_client);
if (ret)
return ret;
client = this_client;
}
memset(&this_cred, 0, sizeof(this_cred));
this_cred.client = client;
this_cred.server = server;
this_cred.times.endtime = 0;
this_cred.ticket.length = 0;
in_creds = &this_cred;
}
memset(&this_cred, 0, sizeof(this_cred));
this_cred.client = client;
this_cred.server = server;
this_cred.times.endtime = 0;
this_cred.ticket.length = 0;
in_creds = &this_cred;
}
if (in_creds->ticket.length == 0) {
ret = krb5_get_credentials (context, 0, ccache, in_creds, &creds);
if (ret)
return ret;
} else {
creds = in_creds;
}
if (out_creds)
*out_creds = creds;
if (in_creds->ticket.length == 0) {
ret = krb5_get_credentials (context, 0, ccache, in_creds, &creds);
if (ret)
return ret;
} else {
creds = in_creds;
}
ret = krb5_mk_req_extended (context,
auth_context,
ap_req_options,
in_data,
creds,
&ap_req);
ret = krb5_mk_req_extended (context,
auth_context,
ap_req_options,
in_data,
creds,
&ap_req);
if (ret)
return ret;
if (out_creds)
*out_creds = creds;
else
krb5_free_creds(context, creds);
if(this_client)
krb5_free_principal(context, this_client);
ret = krb5_write_message (context,
p_fd,
&ap_req);
if (ret)
return ret;
krb5_data_free (&ap_req);
ret = krb5_read_message (context, p_fd, &error_data);
if (ret)
return ret;
if (error_data.length != 0) {
KRB_ERROR error;
ret = krb5_rd_error (context, &error_data, &error);
krb5_data_free (&error_data);
if (ret == 0) {
free_KRB_ERROR(&error);
return error.error_code;
} else
return ret;
}
if (ap_req_options & AP_OPTS_MUTUAL_REQUIRED) {
krb5_data ap_rep;
krb5_ap_rep_enc_part *ignore;
krb5_data_zero (&ap_rep);
ret = krb5_read_message (context,
p_fd,
&ap_rep);
if (ret)
return ret;
ret = krb5_rd_rep (context, *auth_context, &ap_rep,
rep_result ? rep_result : &ignore);
ret = krb5_write_message (context,
p_fd,
&ap_req);
if (ret)
return ret;
if (rep_result == NULL)
krb5_free_ap_rep_enc_part (context, ignore);
krb5_data_free (&ap_rep);
}
return 0;
return ret;
krb5_data_free (&ap_req);
ret = krb5_read_message (context, p_fd, &error_data);
if (ret)
return ret;
if (error_data.length != 0) {
KRB_ERROR error;
ret = krb5_rd_error (context, &error_data, &error);
krb5_data_free (&error_data);
if (ret == 0) {
free_KRB_ERROR(&error);
return error.error_code;
} else
return ret;
}
if (ap_req_options & AP_OPTS_MUTUAL_REQUIRED) {
krb5_data ap_rep;
krb5_ap_rep_enc_part *ignore;
krb5_data_zero (&ap_rep);
ret = krb5_read_message (context,
p_fd,
&ap_rep);
if (ret)
return ret;
ret = krb5_rd_rep (context, *auth_context, &ap_rep,
rep_result ? rep_result : &ignore);
if (ret)
return ret;
if (rep_result == NULL)
krb5_free_ap_rep_enc_part (context, ignore);
krb5_data_free (&ap_rep);
}
return 0;
}