mk_cred.c: Declare ncreds as krb5_int32 so that the right type will be
passed to krb5_mk_ncred_basic (win16 fix)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9815
dc483132-0cff-0310-8789-
dd5450dbe970
+Fri Feb 7 09:41:33 1997 Richard Basch <basch@lehman.com>
+
+ * mk_cred.c (krb5_mk_ncred): Declare ncred as krb5_int32 so that
+ the right value is pushed onto the stack when calling
+ krb5_mk_ncred_basic()
+
+ * copy_addrs.c fwd_tgt.c mk_cred.c:
+ Use FAR keyword in pointer declarations.
+
+ * sendauth.c (krb5_sendauth): Do not free the credentials if they
+ are being returned to the caller [krb5-libs/357]
+
Sun Feb 2 20:57:15 1997 Richard Basch <basch@lehman.com>
* serialize.c: Added FAR declarations to pointer arguments for
Sun Feb 2 20:57:15 1997 Richard Basch <basch@lehman.com>
* serialize.c: Added FAR declarations to pointer arguments for
const krb5_address FAR *inad;
krb5_address FAR * FAR *outad;
{
const krb5_address FAR *inad;
krb5_address FAR * FAR *outad;
{
+ krb5_address FAR *tmpad;
- if (!(tmpad = (krb5_address *)malloc(sizeof(*tmpad))))
+ if (!(tmpad = (krb5_address FAR *)malloc(sizeof(*tmpad))))
return ENOMEM;
#ifdef HAVE_C_STRUCTURE_ASSIGNMENT
*tmpad = *inad;
return ENOMEM;
#ifdef HAVE_C_STRUCTURE_ASSIGNMENT
*tmpad = *inad;
krb5_data FAR *outbuf;
{
krb5_replay_data replaydata;
krb5_data FAR *outbuf;
{
krb5_replay_data replaydata;
- krb5_data * scratch = 0;
- krb5_address **addrs = 0;
+ krb5_data FAR * scratch = 0;
+ krb5_address FAR * FAR *addrs = 0;
krb5_error_code retval;
krb5_creds creds, tgt;
krb5_error_code retval;
krb5_creds creds, tgt;
+ krb5_creds FAR *pcreds;
krb5_flags kdcoptions;
int close_cc = 0;
int free_rhost = 0;
krb5_flags kdcoptions;
int close_cc = 0;
int free_rhost = 0;
static krb5_error_code
krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock,
replaydata, local_addr, remote_addr, pcred)
static krb5_error_code
krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock,
replaydata, local_addr, remote_addr, pcred)
- krb5_context context;
- krb5_creds ** ppcreds;
- krb5_int32 nppcreds;
- krb5_keyblock * keyblock;
- krb5_replay_data * replaydata;
- krb5_address * local_addr;
- krb5_address * remote_addr;
- krb5_cred * pcred;
+ krb5_context context;
+ krb5_creds FAR * FAR * ppcreds;
+ krb5_int32 nppcreds;
+ krb5_keyblock FAR * keyblock;
+ krb5_replay_data FAR * replaydata;
+ krb5_address FAR * local_addr;
+ krb5_address FAR * remote_addr;
+ krb5_cred FAR * pcred;
{
krb5_cred_enc_part credenc;
krb5_error_code retval;
{
krb5_cred_enc_part credenc;
krb5_error_code retval;
credenc.timestamp = replaydata->timestamp;
/* Get memory for creds and initialize it */
credenc.timestamp = replaydata->timestamp;
/* Get memory for creds and initialize it */
- size = sizeof(krb5_cred_info *) * (nppcreds + 1);
- credenc.ticket_info = (krb5_cred_info **) malloc(size);
+ size = sizeof(krb5_cred_info FAR *) * (nppcreds + 1);
+ credenc.ticket_info = (krb5_cred_info FAR * FAR *) malloc(size);
if (credenc.ticket_info == NULL)
return ENOMEM;
memset(credenc.ticket_info, 0, size);
if (credenc.ticket_info == NULL)
return ENOMEM;
memset(credenc.ticket_info, 0, size);
krb5_data FAR * FAR * ppdata;
krb5_replay_data FAR * outdata;
{
krb5_data FAR * FAR * ppdata;
krb5_replay_data FAR * outdata;
{
- krb5_address * premote_fulladdr = NULL;
- krb5_address * plocal_fulladdr = NULL;
+ krb5_address FAR * premote_fulladdr = NULL;
+ krb5_address FAR * plocal_fulladdr = NULL;
krb5_address remote_fulladdr;
krb5_address local_fulladdr;
krb5_address remote_fulladdr;
krb5_address local_fulladdr;
- krb5_error_code retval;
- krb5_keyblock * keyblock;
- krb5_replay_data replaydata;
- krb5_cred * pcred;
- int ncred;
+ krb5_error_code retval;
+ krb5_keyblock FAR * keyblock;
+ krb5_replay_data replaydata;
+ krb5_cred FAR * pcred;
+ krb5_int32 ncred;
local_fulladdr.contents = 0;
remote_fulladdr.contents = 0;
local_fulladdr.contents = 0;
remote_fulladdr.contents = 0;
memset(pcred, 0, sizeof(krb5_cred));
if ((pcred->tickets
memset(pcred, 0, sizeof(krb5_cred));
if ((pcred->tickets
- = (krb5_ticket **)malloc(sizeof(krb5_ticket *) * (ncred + 1))) == NULL) {
+ = (krb5_ticket FAR * FAR *)malloc(sizeof(krb5_ticket FAR *) * (ncred + 1))) == NULL) {
retval = ENOMEM;
free(pcred);
}
retval = ENOMEM;
free(pcred);
}
- memset(pcred->tickets, 0, sizeof(krb5_ticket *) * (ncred +1));
+ memset(pcred->tickets, 0, sizeof(krb5_ticket FAR *) * (ncred +1));
/* Get keyblock */
if ((keyblock = auth_context->local_subkey) == NULL)
/* Get keyblock */
if ((keyblock = auth_context->local_subkey) == NULL)
krb5_replay_data FAR * outdata;
{
krb5_error_code retval;
krb5_replay_data FAR * outdata;
{
krb5_error_code retval;
+ krb5_creds FAR * FAR *ppcreds;
- if ((ppcreds = (krb5_creds **)malloc(sizeof(*ppcreds) * 2)) == NULL) {
+ if ((ppcreds = (krb5_creds FAR * FAR *)malloc(sizeof(*ppcreds) * 2)) == NULL) {
{
krb5_octet result;
krb5_creds creds;
{
krb5_octet result;
krb5_creds creds;
- krb5_creds * credsp = NULL;
- krb5_creds * credspout = NULL;
+ krb5_creds FAR * credsp = NULL;
+ krb5_creds FAR * credspout = NULL;
krb5_error_code retval = 0;
krb5_data inbuf, outbuf;
int len;
krb5_error_code retval = 0;
krb5_data inbuf, outbuf;
int len;
error_return:
krb5_free_cred_contents(context, &creds);
error_return:
krb5_free_cred_contents(context, &creds);
+ if (!out_creds && credspout)
krb5_free_creds(context, credspout);
if (!ccache && use_ccache)
krb5_cc_close(context, use_ccache);
krb5_free_creds(context, credspout);
if (!ccache && use_ccache)
krb5_cc_close(context, use_ccache);