Initial RADIUS support (using libradius). See the man page for

details.  Compiling with -DNORADIUS (the default for `release')
removes support.

TODO: The functionality in libradius::rad_send_request() needs
      to be supplied as a set of routines so that ppp doesn't
      have to wait indefinitely for the radius server(s).  Instead,
      we need to get a descriptor back, select() on the descriptor,
      and ask libradius to service it when necessary.
      For now, ppp blocks SIGALRM while in rad_send_request(), so
      it misses PAP/CHAP retries & timeouts if they occur.

      Only PAP is functional.  When CHAP is attempted, libradius
      complains that no User-Password has been specified... rfc2138
      says that it *mustn't* be used for CHAP :-(

Sponsored by: Internet Business Solutions Ltd., Switzerland

1 files changed, 17 insertions, 9 deletions

diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 696479e..e519ab4 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.49 1998/10/20 00:19:38 brian Exp $
+#	$Id: Makefile,v 1.50 1998/10/22 02:32:48 brian Exp $
 
 PROG=	ppp
 SRCS=	arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c command.c \
@@ -7,14 +7,12 @@ SRCS=	arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c command.c \
 	mp.c pap.c physical.c pred.c probe.c prompt.c route.c server.c \
 	sig.c slcompress.c systems.c throughput.c timer.c tun.c vjcomp.c
 CFLAGS+=-Wall
-LDADD+= -lutil -lz
-DPADD+=	${LIBUTIL} ${LIBZ}
+LDADD+= -lcrypt -lmd -lutil -lz
+DPADD+=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
 BINMODE=4554
 BINOWN=	root
 BINGRP=	network
 MAN8=	ppp.8
-LDADD+=	-lmd -lcrypt
-DPADD+= ${LIBMD} ${LIBCRYPT}
 
 .if defined(RELEASE_CRUNCH)
 CFLAGS+=-DRELEASE_CRUNCH
@@ -38,12 +36,22 @@ LDADD+= -ldes
 DPADD+= ${LIBDES}
 .endif
 
+.if defined(NORADIUS)
+CFLAGS+=-DNORADIUS
+.else
+.if !defined(RELEASE_CRUNCH)
+SRCS+=	radius.c
+LDADD+=	-lradius
+DPADD+= ${LIBRADIUS}
+.endif
+.endif
+
 .if defined(RELEASE_CRUNCH)
-# We must create these objects because the crunchgen will link them,
+# We must create these objects because crunchgen will link them,
 # and we don't want any unused symbols to spoil the final link.
-CFLAGS+=-DNOALIAS
-SRCS+=	alias_cmd.c chap_ms.c
-chap_ms.o alias_cmd.o:
+CFLAGS+=-DNOALIAS -DNORADIUS
+SRCS+=	alias_cmd.c chap_ms.c radius.c
+chap_ms.o alias_cmd.o radius.o:
 	>null_${.PREFIX}.c
 	cc -c -o ${.TARGET} null_${.PREFIX}.c
 .endif