[797] in Zephyr_Bugs
Minor changes to make zephyr-2.1.beta1 compile
daemon@ATHENA.MIT.EDU (bg@sics.se)
Thu Jul 4 10:00:57 1996
Date: Thu, 4 Jul 1996 16:00:52 +0200
To: zephyr-bugs@MIT.EDU
From: bg@sics.se
As a suggestion, wouldn't it be nice if krb_set_key() and
decomp_ticket() were named differently since thje are already in
libkrb? In what way are they really different?
diff -r -u zephyr-2.1.beta1.DIST/clients/zctl/zctl.c zephyr-2.1.beta1/clients/zctl/zctl.c
--- zephyr-2.1.beta1.DIST/clients/zctl/zctl.c Fri Apr 5 02:30:34 1996
+++ zephyr-2.1.beta1/clients/zctl/zctl.c Thu Jul 4 15:39:00 1996
@@ -135,7 +135,7 @@
ZVERSIONHDR,
ZVERSIONMAJOR,ZVERSIONMINOR);
- ss_listen(sci_idx,&code);
+ code = ss_listen(sci_idx);
exit(0);
}
diff -r -u zephyr-2.1.beta1.DIST/server/kopt.c zephyr-2.1.beta1/server/kopt.c
--- zephyr-2.1.beta1.DIST/server/kopt.c Thu Apr 4 00:59:15 1996
+++ zephyr-2.1.beta1/server/kopt.c Thu Jul 4 15:45:56 1996
@@ -160,10 +160,11 @@
*/
int
-krb_set_key(key,cvt)
- char *key;
+krb_set_key(key_,cvt)
+ void *key_;
int cvt;
{
+ char *key = key_;
#ifdef NOENCRYPTION
memset(serv_key, 0, sizeof(serv_key));
return KSUCCESS;
@@ -234,7 +235,7 @@
KTEXT authent; /* The received message */
char *service; /* Service name */
char *instance; /* Service instance */
- unsigned KRB_INT32 from_addr; /* Net address of originating host */
+ KRB_INT32 from_addr; /* Net address of originating host */
AUTH_DAT *ad; /* Structure to be filled in */
char *fn; /* Filename to get keys from */
{
@@ -542,16 +543,16 @@
char *pname; /* Authentication name */
char *pinstance; /* Principal's instance */
char *prealm; /* Principal's authentication domain */
- unsigned long *paddress; /* Net address of entity
+ KRB_UINT32 *paddress; /* Net address of entity
* requesting ticket */
C_Block session; /* Session key inserted in ticket */
int *life; /* Lifetime of the ticket */
- unsigned long *time_sec; /* Issue time and date */
+ KRB_UINT32 *time_sec; /* Issue time and date */
char *sname; /* Service name */
char *sinstance; /* Service instance */
- C_Block key; /* Service's secret key
+ des_cblock *key; /* Service's secret key
* (to decrypt the ticket) */
- Sched key_s; /* The precomputed key schedule */
+ struct des_ks_struct *key_s; /* The precomputed key schedule */
{
static int tkt_swap_bytes;
unsigned char *uptr;
diff -r -u zephyr-2.1.beta1.DIST/server/zserver.h zephyr-2.1.beta1/server/zserver.h
--- zephyr-2.1.beta1.DIST/server/zserver.h Thu Apr 4 00:59:43 1996
+++ zephyr-2.1.beta1/server/zserver.h Thu Jul 4 15:40:11 1996
@@ -250,9 +250,9 @@
#ifndef NOENCRYPTION
Sched *check_key_sched_cache __P((des_cblock key));
void add_to_key_sched_cache __P((des_cblock key, Sched *sched));
-int krb_set_key __P((char *key, int cvt));
-int krb_rd_req __P((KTEXT authent, char *service, char *instance,
- unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn));
+/* int krb_set_key __P((char *key, int cvt)); */
+/* int krb_rd_req __P((KTEXT authent, char *service, char *instance,
+ unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); */
int krb_find_ticket __P((KTEXT authent, KTEXT ticket));
int krb_get_lrealm __P((char *r, int n));
#endif
