security/kth-krb4: Add DragonFly and FreeBSD support

The majority of these patches were inspired from FreeBSD's ports.  FreeBSD,
along with at least Debian, have removed Kerberos4 due to secuity concerns.
From: http://web.mit.edu/kerberos/krb4-end-of-life.html :

"Serious protocol flaws[2] have been found in Kerberos 4. These flaws permit
attacks which require far less effort than an exhaustive search of the DES
key space. These flaws make Kerberos 4 cross-realm authentication an
unacceptable security risk and raise serious questions about the security of
the entire Kerberos 4 protocol.

The known insecurity of DES, combined with the recently discovered protocol
flaws, make it extremely inadvisable to rely on the security of version 4 of
the Kerberos protocol. These factors motivate the MIT Kerberos Team to remove
support for Kerberos version 4 from the MIT implementation of Kerberos."

This end-of-life announcement is dated 19 October 2006.  I think it's a
good question to ask why this package and the packages that depend on it
are still in pkgsrc.


(marino)

$NetBSD: patch-appl_ftp_ftpd_ftpcmd.y,v 1.1 2011/11/28 19:33:13 marino Exp $

--- appl/ftp/ftpd/ftpcmd.y.orig	2001-08-05 06:39:29.000000000 +0000
+++ appl/ftp/ftpd/ftpcmd.y
@@ -103,7 +103,7 @@ static int		 yylex (void);
 	UMASK	IDLE	CHMOD
 
 	AUTH	ADAT	PROT	PBSZ	CCC	MIC
-	CONF	ENC
+	CNFX	ENC
 
 	KAUTH	KLIST	KDESTROY KRBTKFILE AFSLOG
 	LOCATE	URL
@@ -695,7 +695,7 @@ rcmd
 			mec($3, prot_safe);
 			free($3);
 		}
-	| CONF SP STRING CRLF
+	| CNFX SP STRING CRLF
 		{
 			mec($3, prot_confidential);
 			free($3);
@@ -984,7 +984,7 @@ struct tab cmdtab[] = {		/* In order def
 	{ "PROT", PROT,	STR1, 1,	"<sp> prot-level" },
 	{ "CCC",  CCC,	ARGS, 1,	"" },
 	{ "MIC",  MIC,	STR1, 1,	"<sp> integrity command" },
-	{ "CONF", CONF,	STR1, 1,	"<sp> confidentiality command" },
+	{ "CONF", CNFX,	STR1, 1,	"<sp> confidentiality command" },
 	{ "ENC",  ENC,	STR1, 1,	"<sp> privacy command" },
 
 	/* RFC2389 */

$NetBSD: patch-appl_ftp_ftpd_pathnames.h,v 1.1 2011/11/28 19:33:13 marino Exp $

--- appl/ftp/ftpd/pathnames.h.orig	2002-08-12 15:09:14.000000000 +0000
+++ appl/ftp/ftpd/pathnames.h
@@ -49,7 +49,9 @@
 #define _PATH_BSHELL "/bin/sh"
 #endif
 
+#ifndef _PATH_FTPUSERS
 #define	_PATH_FTPUSERS		SYSCONFDIR "/ftpusers"
+#endif
 #define	_PATH_FTPCHROOT		SYSCONFDIR "/ftpchroot"
 #define	_PATH_FTPWELCOME	SYSCONFDIR "/ftpwelcome"
 #define	_PATH_FTPLOGINMESG	SYSCONFDIR "/motd"

$NetBSD: patch-lib_kadm_kadm_cli_wrap.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/kadm/kadm_cli_wrap.c.orig	2011-11-28 02:10:03.761978000 +0000
+++ lib/kadm/kadm_cli_wrap.c
@@ -138,7 +143,12 @@ kadm_cli_conn(void)
 /* takes in the sess_key and key_schedule and sets them appropriately */
 static int
 kadm_cli_keyd(des_cblock (*s_k), /* session key */
-	      struct des_ks_struct *s_s) /* session key schedule */
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	      des_key_schedule s_s
+#else
+	      struct des_ks_struct *s_s
+#endif
+) /* session key schedule */
 {
 	CREDENTIALS cred;	       /* to get key data */
 	int stat;

$NetBSD: patch-lib_krb_krb-protos.h,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/krb-protos.h.orig	2001-08-26 01:46:51.000000000 +0000
+++ lib/krb/krb-protos.h
@@ -177,7 +177,11 @@ krb_check_auth __P((
 	u_int32_t checksum,
 	MSG_DAT *msg_data,
 	des_cblock *session,
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	des_key_schedule schedule,
+#else
 	struct des_ks_struct *schedule,
+#endif
 	struct sockaddr_in *laddr,
 	struct sockaddr_in *faddr));
 
@@ -457,7 +461,11 @@ krb_mk_priv __P((
 	void *in,
 	void *out,
 	u_int32_t length,
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	des_key_schedule schedule,
+#else
 	struct des_ks_struct *schedule,
+#endif
 	des_cblock *key,
 	struct sockaddr_in *sender,
 	struct sockaddr_in *receiver));
@@ -540,7 +548,11 @@ int32_t KRB_LIB_FUNCTION
 krb_rd_priv __P((
 	void *in,
 	u_int32_t in_length,
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	des_key_schedule schedule,
+#else
 	struct des_ks_struct *schedule,
+#endif
 	des_cblock *key,
 	struct sockaddr_in *sender,
 	struct sockaddr_in *receiver,
@@ -583,7 +595,11 @@ krb_recvauth __P((
 	struct sockaddr_in *laddr,
 	AUTH_DAT *kdata,
 	char *filename,
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	des_key_schedule schedule,
+#else
 	struct des_ks_struct *schedule,
+#endif
 	char *version));
 
 int KRB_LIB_FUNCTION
@@ -597,7 +613,11 @@ krb_sendauth __P((
 	u_int32_t checksum,
 	MSG_DAT *msg_data,
 	CREDENTIALS *cred,
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	des_key_schedule schedule,
+#else
 	struct des_ks_struct *schedule,
+#endif
 	struct sockaddr_in *laddr,
 	struct sockaddr_in *faddr,
 	char *version));

$NetBSD: patch-lib_krb_krb_check_auth.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/krb_check_auth.c.orig	1999-12-02 16:58:42.000000000 +0000
+++ lib/krb/krb_check_auth.c
@@ -50,7 +50,11 @@ krb_check_auth(KTEXT packet,
 	       u_int32_t checksum,
 	       MSG_DAT *msg_data,
 	       des_cblock *session,
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	       des_key_schedule schedule,
+#else
 	       struct des_ks_struct *schedule,
+#endif
 	       struct sockaddr_in *laddr,
 	       struct sockaddr_in *faddr)
 {

$NetBSD: patch-lib_krb_mk_priv.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/mk_priv.c.orig	2001-09-16 22:41:58.000000000 +0000
+++ lib/krb/mk_priv.c
@@ -78,7 +78,12 @@ RCSID("$Id: mk_priv.c,v 1.25 2001/09/16
 
 int32_t
 krb_mk_priv(void *in, void *out, u_int32_t length, 
-	    struct des_ks_struct *schedule, des_cblock *key, 
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	    des_key_schedule schedule,
+#else
+	    struct des_ks_struct *schedule,
+#endif
+	    des_cblock *key, 
 	    struct sockaddr_in *sender, struct sockaddr_in *receiver)
 {
     unsigned char *p = (unsigned char*)out;

$NetBSD: patch-lib_krb_rd_priv.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/rd_priv.c.orig	2001-09-16 22:41:58.000000000 +0000
+++ lib/krb/rd_priv.c
@@ -57,7 +57,12 @@ RCSID("$Id: rd_priv.c,v 1.30 2001/09/16
 
 int32_t
 krb_rd_priv(void *in, u_int32_t in_length, 
-	    struct des_ks_struct *schedule, des_cblock *key, 
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	    des_key_schedule schedule,
+#else
+	    struct des_ks_struct *schedule,
+#endif
+	    des_cblock *key,
 	    struct sockaddr_in *sender, struct sockaddr_in *receiver, 
 	    MSG_DAT *m_data)
 {

$NetBSD: patch-lib_krb_recvauth.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/recvauth.c.orig	2001-08-26 02:52:18.000000000 +0000
+++ lib/krb/recvauth.c
@@ -108,7 +108,11 @@ krb_recvauth(int32_t options,	/* bit-pat
 	     struct sockaddr_in *laddr,	/* local address */
 	     AUTH_DAT *kdata,	/* kerberos data (returned) */
 	     char *filename,	/* name of file with service keys */
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	     des_key_schedule schedule,
+#else
 	     struct des_ks_struct *schedule, /* key schedule (return) */
+#endif
 	     char *version)	/* version string (filled in) */
 {
     char krb_vers[KRB_SENDAUTH_VLEN + 1]; /* + 1 for the null terminator */

$NetBSD: patch-lib_krb_sendauth.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/sendauth.c.orig	1999-09-16 20:41:55.000000000 +0000
+++ lib/krb/sendauth.c
@@ -103,7 +103,11 @@ krb_sendauth(int32_t options,	/* bit-pat
 	     u_int32_t checksum, /* checksum to include in request */
 	     MSG_DAT *msg_data,	/* mutual auth MSG_DAT (return) */
 	     CREDENTIALS *cred,	/* credentials (return) */
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	     des_key_schedule schedule,
+#else
 	     struct des_ks_struct *schedule, /* key schedule (return) */
+#endif
 	     struct sockaddr_in *laddr, /* local address */
 	     struct sockaddr_in *faddr,	/* address of foreign host on fd */
 	     char *version)	/* version string */

$NetBSD: patch-lib_krb_solaris_compat.c,v 1.1 2011/11/28 19:33:13 marino Exp $

--- lib/krb/solaris_compat.c.orig	1999-12-02 16:58:44.000000000 +0000
+++ lib/krb/solaris_compat.c
@@ -42,7 +42,12 @@ RCSID("$Id: solaris_compat.c,v 1.4 1999/
 
 int32_t
 _C0095C2A(void *in, void *out, u_int32_t length, 
-	  struct des_ks_struct *schedule, des_cblock *key, 
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	des_key_schedule schedule,
+#else
+	  struct des_ks_struct *schedule,
+#endif
+	  des_cblock *key,
 	  struct sockaddr_in *sender, struct sockaddr_in *receiver)
 {
     return krb_mk_priv (in, out, length, schedule, key, sender, receiver);
@@ -50,7 +55,12 @@ _C0095C2A(void *in, void *out, u_int32_t
 
 int32_t
 _C0095C2B(void *in, u_int32_t in_length, 
-	  struct des_ks_struct *schedule, des_cblock *key, 
+#if defined(__DragonFly__) || defined (__FreeBSD__)
+	  des_key_schedule schedule,
+#else
+	  struct des_ks_struct *schedule,
+#endif
+	  des_cblock *key,
 	  struct sockaddr_in *sender, struct sockaddr_in *receiver, 
 	  MSG_DAT *m_data)
 {