Merit AAA RADIUS server

4 files changed, 150 insertions, 0 deletions

diff --git a/net/radius/patches/patch-aa b/net/radius/patches/patch-aa
new file mode 100644
index 00000000000..6ae0a9fa6e6
--- /dev/null
+++ b/net/radius/patches/patch-aa
@@ -0,0 +1,95 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
+
+--- Makefile.orig	Sun Mar 21 19:50:53 1999
++++ Makefile	Sun Mar 21 19:51:44 1999
+@@ -51,11 +51,11 @@
+ # Where the configuration files live.
+ RADDB		= ./raddb
+ # Some installation stuff.
+-DAEMON_INSDIR	= /usr/private/etc
+-BIN_INSDIR	= /usr/private/etc
+-MAN_INSDIR	= /usr/local/man
+-RADDB_INSDIR	= /usr/private/etc/raddb.new
+-RADACCT_INSDIR	= /usr/private/etc/radacct
++DAEMON_INSDIR	= ${PREFIX}/sbin
++BIN_INSDIR	= ${PREFIX}/sbin
++MAN_INSDIR	= ${PREFIX}/man
++RADDB_INSDIR	= /etc/raddb
++RADACCT_INSDIR	= /var/log
+ # The server does not need to be owned by root, unless some shadow password
+ # scheme needs it.  You might create a user id "radius" for just this purpose.
+ # The O G and M macros are for AIX, OSF/1 and HP-UX, see below.
+@@ -63,12 +63,12 @@
+ G		= -g
+ M		= -m
+ RADOWN		= root
+-RADGRP		= bin
++RADGRP		= wheel
+ 
+ # Define COMPRESS to hold the pathname of your favourite compress program if
+ # you need to override the default value of /usr/ucb/compress:
+-#COMPRESS	= -DRAD_COMPRESS=\"/usr/local/bin/gzip\"
+-#COMPRESS_ARGS	= -DCOMPRESS_ARGS=\"-9\"
++COMPRESS	= -DRAD_COMPRESS=\"${GNUZIP}\"
++COMPRESS_ARGS	= -DCOMPRESS_ARGS=\"-nf9\"
+ 
+ # Define SRV to hold any combination of server names you'd like to override:
+ #SRV3	  = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\"
+@@ -90,13 +90,13 @@
+ # -DBINARY_FILTERS - support for Ascend binary filters
+ # -DIP_ADDR_POOL - support for Ascend IP address pools
+ #
+-ASCEND	  = -DASCEND -DBINARY_FILTERS
++ASCEND	  = -DASCEND -DBINARY_FILTERS -DIP_ADDR_POOL
+ 
+ # Define USR_CCA to enable USR support:
+ #USR	  = -DUSR_CCA
+ 
+ # Define RAD_LOG_FMT to change how the logfile name changes:
+-RAD_LOG_FMT	= -DRADIUS_LOG_FMT=\"logfile.%y%m%d\"
++RAD_LOG_FMT	= -DRADIUS_LOG_FMT=\"radius\"
+ 
+ STUFF	  = $(DIRS) $(SRV) $(COMPRESS) $(COMPRESS_ARGS) $(CHK_SHELLS) \
+ 	$(ASCEND) $(USR)
+@@ -122,10 +122,10 @@
+ # radiusd -- the default
+ #
+ #--------------------------------------------------------------------------
+-DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
++#DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
+ # end local defs additions
+-RADLIBS	  = ./logdaemon-5.6/skey/libskey.a
+-INCS	  = -I./logdaemon-5.6/skey
++#RADLIBS	  = ./logdaemon-5.6/skey/libskey.a
++#INCS	  = -I./logdaemon-5.6/skey
+ 
+ #
+ # mkerb
+@@ -237,12 +237,12 @@
+ #
+ #--------------------------------------------------------------------------
+ 
+-CC	  = cc
+-CFLAGS	  = -g $(DEFS) $(INCS)
+-LDFLAGS	  =
+-LIBS	  =
+-RANLIB	  = ranlib
+-INSTALL	  = /bin/install
++#CC	  = cc
++#CFLAGS	  = -g $(DEFS) $(INCS)
++#LDFLAGS	  =
++#LIBS	  =
++#RANLIB	  = ranlib
++#INSTALL	  = /bin/install
+ 
+ #
+ # Solaris 2.x [[NB: if BIND/named not SMCC, try CFLAGS = ... -DBSD=1 ...]]
+@@ -438,6 +438,8 @@
+ #INSTALL	  = /bin/install
+ 
+ # You must un-comment one, and only one, of the above sections!
++
++CFLAGS+= ${MERIT} ${STUFF}
+ 
+ # No modifications are necessary below this line except possibly near line 500.
+ 
diff --git a/net/radius/patches/patch-ab b/net/radius/patches/patch-ab
new file mode 100644
index 00000000000..d1a09a14d06
--- /dev/null
+++ b/net/radius/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
+
+--- src/mit_stringtokey.c.orig	Tue May 12 15:37:17 1998
++++ src/mit_stringtokey.c	Fri Mar 19 21:14:12 1999
+@@ -63,7 +63,6 @@
+ 	register char  *p_char;
+ 	static char     k_char[64];
+ 	static des_key_schedule key_sked;
+-	extern unsigned long des_cbc_cksum ();
+ 
+ 	in_str = str;
+ 	forward = 1;
diff --git a/net/radius/patches/patch-ac b/net/radius/patches/patch-ac
new file mode 100644
index 00000000000..a45429edc5e
--- /dev/null
+++ b/net/radius/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
+
+--- src/rad.ftp.c.orig	Sat Oct 10 16:17:47 1998
++++ src/rad.ftp.c	Sun Mar 21 19:56:35 1999
+@@ -3,6 +3,8 @@
+ 
+ /* this file still needs to be proof-read for cross-platform compatibility */
+ 
++#include <sys/types.h>
++
+ /* used by ???*/
+ #include <sys/ioctl.h>
+ 
diff --git a/net/radius/patches/patch-ad b/net/radius/patches/patch-ad
new file mode 100644
index 00000000000..91cd7d05ca3
--- /dev/null
+++ b/net/radius/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $
+
+--- src/rad.skey.c.orig	Sat Oct 10 16:18:08 1998
++++ src/rad.skey.c	Sun Mar 21 21:26:32 1999
+@@ -75,11 +75,15 @@
+ 		*ptr = NULL;
+ 	}
+ 
++#ifndef __NetBSD__
+ 	/* Check if this user has valid SKEY information and get the challenge. */
+ 	if (skeyinfo(&skey, username, challenge) == 0)
+ 	{
+ 		/* position the pointer in the key for verification */
+ 		if (skeylookup (&skey, username) != 0) 
++#else
++		if (skeychallenge (&skey, username, challenge, sizeof(challenge)) != 0) 
++#endif
+ 		{
+ 			dprintf(2, (LOG_DAEMON, LOG_DEBUG, "%s: skeylookup failed.", func));
+ 			return EV_NAK;
+@@ -92,7 +96,9 @@
+ 		}
+ 		reply_sprintf (0, authreq, "%s", challenge);
+ 		return EV_NAK;
++#ifndef __NetBSD__
+ 	}
+ 	/* The user has no SKEY information.  Just NAK */
+ 	return EV_NAK;
++#endif
+ }