[296] in Kerberos-V5-bugs
random-library-fixes.patch
daemon@ATHENA.MIT.EDU (Marc Horowitz)
Fri Feb 26 17:55:20 1993
To: krb5-bugs@MIT.EDU
Date: Fri, 26 Feb 1993 17:51:49 -0500
From: Marc Horowitz <marc@Aktis.COM>
** random library fixes
./include/krb5/stock/osconf.h
made DEFAULT_KEYTAB_NAME not dependent on a shared location.
./lib/vfprintf.c
./lib/vsprintf.c
Made definitions of v[fs]printf match the ANSI spec
./kdc/kerberos_v4.c
sendto renamed to sendto_stub
NeXT compilation fixes
*** ./lib/vsprintf.c.old 1992/11/16 12:08:55
--- ./lib/vsprintf.c 1992/11/16 12:10:59
***************
*** 24,30 ****
int
vsprintf(str, fmt, ap)
! char *str, *fmt;
va_list ap;
{
FILE f;
--- 24,31 ----
int
vsprintf(str, fmt, ap)
! char *str;
! const char *fmt;
va_list ap;
{
FILE f;
*** ./include/krb5/stock/osconf.h.old 1992/11/20 12:58:50
--- ./include/krb5/stock/osconf.h 1992/11/23 22:43:41
***************
*** 58,64 ****
#define DEFAULT_CONFIG_FILENAME "@KRB5ROOT/krb.conf"
#define DEFAULT_TRANS_FILENAME "@KRB5ROOT/krb.realms"
#define DEFAULT_LNAME_FILENAME "@KRB5ROOT/aname"
! #define DEFAULT_KEYTAB_NAME "FILE:@KRB5ROOT/v5srvtab"
#define DEFAULT_KDC_ETYPE ETYPE_DES_CBC_CRC
#define DEFAULT_KDC_KEYTYPE KEYTYPE_DES
--- 58,64 ----
#define DEFAULT_CONFIG_FILENAME "@KRB5ROOT/krb.conf"
#define DEFAULT_TRANS_FILENAME "@KRB5ROOT/krb.realms"
#define DEFAULT_LNAME_FILENAME "@KRB5ROOT/aname"
! #define DEFAULT_KEYTAB_NAME "FILE:@KRB5SRVTABDIR/v5srvtab"
#define DEFAULT_KDC_ETYPE ETYPE_DES_CBC_CRC
#define DEFAULT_KDC_KEYTYPE KEYTYPE_DES
*** ./lib/vfprintf.c.old 1992/11/16 11:57:50
--- ./lib/vfprintf.c 1992/11/16 12:01:17
***************
*** 25,31 ****
int
vfprintf(iop, fmt, ap)
FILE *iop;
! char *fmt;
va_list ap;
{
int len;
--- 25,31 ----
int
vfprintf(iop, fmt, ap)
FILE *iop;
! const char *fmt;
va_list ap;
{
int len;
*** ./kdc/kerberos_v4.c.old 1992/11/16 13:29:47
--- ./kdc/kerberos_v4.c 1992/11/16 13:53:34
***************
*** 387,393 ****
static krb5_error_code retval;
static krb5_data *response;
! void bzero(), bcopy(), com_err(), sleep();
void kerberos_v4(), kerb_err_reply();
#ifdef HAS_STDLIB_H
#include <stdlib.h>
--- 387,399 ----
static krb5_error_code retval;
static krb5_data *response;
! #ifndef bzero
! void bzero();
! #endif
! #ifndef bcopy
! void bcopy();
! #endif
! void com_err(), sleep();
void kerberos_v4(), kerb_err_reply();
#ifdef HAS_STDLIB_H
#include <stdlib.h>
***************
*** 501,507 ****
}
static
! int sendto(s, msg, len, flags, to, to_len)
int s;
const char *msg;
int len, flags;
--- 507,513 ----
}
static
! int sendto_stub(s, msg, len, flags, to, to_len)
int s;
const char *msg;
int len, flags;
***************
*** 859,865 ****
rpkt = create_auth_reply(req_name_ptr, req_inst_ptr,
req_realm_ptr, req_time_ws, 0, a_name_data.exp_date,
a_name_data.key_version, ciph);
! sendto(f, (char *) rpkt->dat, rpkt->length, 0,
(struct sockaddr *) client, S_AD_SZ);
bzero(&a_name_data, sizeof(a_name_data));
bzero(&s_name_data, sizeof(s_name_data));
--- 865,871 ----
rpkt = create_auth_reply(req_name_ptr, req_inst_ptr,
req_realm_ptr, req_time_ws, 0, a_name_data.exp_date,
a_name_data.key_version, ciph);
! sendto_stub(f, (char *) rpkt->dat, rpkt->length, 0,
(struct sockaddr *) client, S_AD_SZ);
bzero(&a_name_data, sizeof(a_name_data));
bzero(&s_name_data, sizeof(s_name_data));
***************
*** 976,982 ****
rpkt = create_auth_reply(ad->pname, ad->pinst,
ad->prealm, time_ws,
0, 0, 0, ciph);
! sendto(f, (char *) rpkt->dat, rpkt->length, 0,
(struct sockaddr *) client, S_AD_SZ);
bzero(&s_name_data, sizeof(s_name_data));
break;
--- 982,988 ----
rpkt = create_auth_reply(ad->pname, ad->pinst,
ad->prealm, time_ws,
0, 0, 0, ciph);
! sendto_stub(f, (char *) rpkt->dat, rpkt->length, 0,
(struct sockaddr *) client, S_AD_SZ);
bzero(&s_name_data, sizeof(s_name_data));
break;
***************
*** 1059,1065 ****
strcat(e_msg, string);
cr_err_reply(e_pkt, req_name_ptr, req_inst_ptr, req_realm_ptr,
req_time_ws, err, e_msg);
! sendto(f, (char *) e_pkt->dat, e_pkt->length, 0,
(struct sockaddr *) client, S_AD_SZ);
}
--- 1065,1071 ----
strcat(e_msg, string);
cr_err_reply(e_pkt, req_name_ptr, req_inst_ptr, req_realm_ptr,
req_time_ws, err, e_msg);
! sendto_stub(f, (char *) e_pkt->dat, e_pkt->length, 0,
(struct sockaddr *) client, S_AD_SZ);
}
