Date: Sun, 19 Mar 2000 09:14:03 -0800 (PST) From: patrick@137.org To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17489: Zephyr port is broken with Kerberos enabled Message-ID: <200003191714.JAA44632@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17489 >Category: ports >Synopsis: Zephyr port is broken with Kerberos enabled >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 19 09:20:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: Patrick Hartling >Release: 4.0-stable >Organization: >Environment: FreeBSD friley-160-236.res.iastate.edu 4.0-STABLE FreeBSD 4.0-STABLE #24: Sat Mar 18 22:32:56 CST 2000 root@friley-160-236.res.iastate.edu:/usr/src/sys/compile/CATBERT i386 >Description: The Zephyr port (ports/net/zephyr) does not compile with Kerberos support due to errors in the Makefile and differences in prototypes between the version of Kerberos being used and the much older Zephyr code. >How-To-Repeat: Try to compile the Zephyr port with Kerberos support. >Fix: The following patches fix the errors (but not the warnings). --- Makefile.orig Sun Mar 19 10:34:04 2000 +++ Makefile Sun Mar 19 11:02:28 2000 @@ -13,8 +13,9 @@ MAINTAINER= ports@FreeBSD.org USE_XLIB= yes -.if exists(/usr/lib/libkrb.a) && defined(MAKE_EBONES) +.if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) CONFIGURE_ARGS="--with-krb4" +CONFIGURE_ENV="LIBS=-lcom_err" .endif HAS_CONFIGURE= yes --- kopt.c.orig Sun Mar 19 10:46:48 2000 +++ kopt.c Sun Mar 19 10:57:57 2000 @@ -62,6 +62,15 @@ #define KERB_ERR_PRINCIPAL_NOT_UNIQUE 9 #define KERB_ERR_NULL_KEY 10 +#ifndef swap_u_long +#define swap_u_long(x) {\ + uint32_t _krb_swap_tmp[4];\ + swab((char *) &x, ((char *) _krb_swap_tmp) +2 ,2); \ + swab(((char *) &x) +2,((char *) _krb_swap_tmp),2); \ + x = _krb_swap_tmp[0]; \ + } +#endif + extern int krb_ap_req_debug; extern struct timeval t_local; @@ -161,7 +170,7 @@ int krb_set_key(key,cvt) - char *key; + void *key; int cvt; { #ifdef NOENCRYPTION @@ -234,7 +243,7 @@ KTEXT authent; /* The received message */ char *service; /* Service name */ char *instance; /* Service instance */ - unsigned KRB_INT32 from_addr; /* Net address of originating host */ + int32_t from_addr; /* Net address of originating host */ AUTH_DAT *ad; /* Structure to be filled in */ char *fn; /* Filename to get keys from */ { --- zserver.h.orig Sun Mar 19 10:42:18 2000 +++ zserver.h Sun Mar 19 10:43:26 2000 @@ -207,9 +207,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_set_key __P((void *key, int cvt)); int krb_rd_req __P((KTEXT authent, char *service, char *instance, - unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); + int32_t 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003191714.JAA44632>