summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/Makefile4
-rw-r--r--net/icradius/Makefile91
-rw-r--r--net/icradius/distinfo1
-rw-r--r--net/icradius/files/icradiusd.sh59
-rw-r--r--net/icradius/files/patch-raddb::dictionary11
-rw-r--r--net/icradius/files/patch-raddb::dictionary.cisco10
-rw-r--r--net/icradius/files/patch-scripts::radius.cgi29
-rw-r--r--net/icradius/files/patch-scripts::radius.db38
-rw-r--r--net/icradius/files/patch-scripts::radwatch55
-rw-r--r--net/icradius/files/patch-src::Make.inc22
-rw-r--r--net/icradius/files/patch-src::Makefile.BSD12
-rw-r--r--net/icradius/files/patch-src::auth.c11
-rw-r--r--net/icradius/files/patch-src::checkrad.pl24
-rw-r--r--net/icradius/files/patch-src::conf.h10
-rw-r--r--net/icradius/files/patch-src::mysql.c49
-rw-r--r--net/icradius/files/patch-src::radiusd.c46
-rw-r--r--net/icradius/files/patch-src::radiusd.h10
-rw-r--r--net/icradius/files/pcisco-raddb::dictionary.cisco_my31
-rw-r--r--net/icradius/files/pcisco-scripts::radius.cgi106
-rw-r--r--net/icradius/files/pcisco-scripts::radius.db34
-rw-r--r--net/icradius/files/pcisco-src::acct.c101
-rw-r--r--net/icradius/files/pcisco-src::mysql.c199
-rw-r--r--net/icradius/files/pcisco-src::proxy.c10
-rw-r--r--net/icradius/files/pcisco-src::radius.h16
-rw-r--r--net/icradius/files/pcisco-src::radiusd.h33
-rw-r--r--net/icradius/pkg-comment1
-rw-r--r--net/icradius/pkg-descr24
-rw-r--r--net/icradius/pkg-message14
-rw-r--r--net/icradius/pkg-plist57
-rw-r--r--net/p5-IC-Radius/Makefile24
-rw-r--r--net/p5-IC-Radius/distinfo1
-rw-r--r--net/p5-IC-Radius/files/patch-Radius.pm20
-rw-r--r--net/p5-IC-Radius/pkg-comment1
-rw-r--r--net/p5-IC-Radius/pkg-descr7
-rw-r--r--net/p5-IC-Radius/pkg-plist5
-rw-r--r--net/radius/Makefile40
-rw-r--r--net/radius/distinfo1
-rw-r--r--net/radius/files/patch-aa131
-rw-r--r--net/radius/files/patch-ab39
-rw-r--r--net/radius/files/patch-ac44
-rw-r--r--net/radius/files/patch-ad67
-rw-r--r--net/radius/files/patch-funcs.c14
-rw-r--r--net/radius/pkg-comment1
-rw-r--r--net/radius/pkg-descr3
-rw-r--r--net/radius/pkg-plist17
-rw-r--r--net/xtradius/Makefile67
-rw-r--r--net/xtradius/distinfo1
-rw-r--r--net/xtradius/files/patch-aa25
-rw-r--r--net/xtradius/files/patch-ab53
-rw-r--r--net/xtradius/files/patch-ac10
-rw-r--r--net/xtradius/files/patch-ad129
-rw-r--r--net/xtradius/files/radiusd.sh.tmpl28
-rw-r--r--net/xtradius/pkg-comment1
-rw-r--r--net/xtradius/pkg-descr8
-rw-r--r--net/xtradius/pkg-plist48
55 files changed, 0 insertions, 1893 deletions
diff --git a/net/Makefile b/net/Makefile
index 1f89442..089487b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -201,7 +201,6 @@
SUBDIR += icqlib
SUBDIR += icqlib0
SUBDIR += icqnix
- SUBDIR += icradius
SUBDIR += icukrell
SUBDIR += ip-tun
SUBDIR += ip6_int
@@ -357,7 +356,6 @@
SUBDIR += p5-File-Rsync
SUBDIR += p5-Frontier-RPC
SUBDIR += p5-Geo-IP
- SUBDIR += p5-IC-Radius
SUBDIR += p5-IO-Interface
SUBDIR += p5-IO-Socket-Multicast
SUBDIR += p5-JUNOScript
@@ -481,7 +479,6 @@
SUBDIR += qadsl
SUBDIR += qtella
SUBDIR += queso
- SUBDIR += radius
SUBDIR += radiusclient
SUBDIR += radiusd-cistron
SUBDIR += radreport
@@ -628,7 +625,6 @@
SUBDIR += xprobe
SUBDIR += xsmbrowser
SUBDIR += xtraceroute
- SUBDIR += xtradius
SUBDIR += xwhois
SUBDIR += yaz
SUBDIR += yaz++
diff --git a/net/icradius/Makefile b/net/icradius/Makefile
deleted file mode 100644
index 6eaf681..0000000
--- a/net/icradius/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for: p5-IC-Radius
-# Date created: 04 Jul 2001
-# Whom: Sergey N. Voronkov <serg@tmn.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME= icradius
-PORTVERSION= 0.18.1
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.innercite.com/pub/icradius/
-
-FORBIDDEN= "Remotely exploitable buffer overflow. See ports/net/freeradius for compatible and non-exploitable replacement."
-
-MAINTAINER= ports@FreeBSD.org
-
-MAKEFILE= Makefile.BSD
-
-.if defined(WITH_CGI)
-RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IC/Radius.pm:${PORTSDIR}/net/p5-IC-Radius \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MD5.pm:${PORTSDIR}/security/p5-MD5
-.endif
-LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-
-MAN8= radiusd.8
-
-IC_LIB= ${PREFIX}/share/icradius
-.if !defined(NOPORTDOCS)
-IC_DOC= ${PREFIX}/share/doc/icradius
-.endif
-
-.if defined(WITH_CGI)
-PLIST_SUB+= CGI=""
-.else
-PLIST_SUB+= CGI="@comment "
-.endif
-
-# Define FOR_CISCO=yes to make it CISCO specific
-
-.if defined(FOR_CISCO)
-post-patch:
- ( cd ${WRKSRC} ; \
- for fn in ${FILESDIR}/pcisco-*; do \
- ${PATCH} < $$fn; \
- done )
-.endif
-
-do-build:
- cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE}
-
-do-install:
- [ -d /var/log/radacct ] || ${MKDIR} -m 700 /var/log/radacct
- @${MKDIR} ${PREFIX}/etc/raddb
- ${INSTALL_DATA} -m 600 ${WRKSRC}/raddb/radius.conf \
- ${PREFIX}/etc/raddb/radius.conf.sample
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${IC_DOC}
- ${INSTALL_DATA} ${WRKSRC}/COPY* ${IC_DOC}
- ${INSTALL_DATA} ${WRKSRC}/doc/README* ${IC_DOC}
- ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${IC_DOC}
- ${INSTALL_DATA} ${WRKSRC}/doc/THANKS ${IC_DOC}
- ${INSTALL_DATA} ${WRKSRC}/doc/TODO ${IC_DOC}
-.endif
- @${MKDIR} ${IC_LIB}
- @${MKDIR} ${IC_LIB}/raddb
- for fn in dictionary dictionary.ascend dictionary.cisco \
- dictionary.compat dictionary.foundry dictionary.livingston \
- dictionary.merit dictionary.redback dictionary.shiva \
- dictionary.tunnel dictionary.usr dictionary.versanet \
- huntgroups; do \
- ${INSTALL_DATA} ${WRKSRC}/raddb/$$fn ${IC_LIB}/raddb; \
- done
- @${MKDIR} ${IC_LIB}/scripts
- cd ${WRKSRC}/scripts && ${CP} -rp *.pl radius.db images \
- radlast radwho README ${IC_LIB}/scripts
- ${INSTALL_PROGRAM} ${WRKSRC}/src/radiusd ${PREFIX}/sbin
- ${SED} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/src/checkrad.pl > ${PREFIX}/sbin/checkrad
- ${CHMOD} 711 ${PREFIX}/sbin/checkrad
- ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/checkrad
- ${SED} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/scripts/radwatch > ${PREFIX}/sbin/radwatch
- ${CHMOD} 755 ${PREFIX}/sbin/radwatch
- ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/radwatch
- ${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
-.if defined(WITH_CGI)
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/radius.cgi ${PREFIX}/libexec
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/usage.cgi ${PREFIX}/libexec
-.endif
- ${INSTALL_SCRIPT} ${FILESDIR}/icradiusd.sh ${PREFIX}/etc/rc.d
-
-.include <bsd.port.mk>
diff --git a/net/icradius/distinfo b/net/icradius/distinfo
deleted file mode 100644
index 2322960..0000000
--- a/net/icradius/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (icradius-0.18.1.tar.gz) = 55585fd9947d40ab3243deb4f7738770
diff --git a/net/icradius/files/icradiusd.sh b/net/icradius/files/icradiusd.sh
deleted file mode 100644
index a603533..0000000
--- a/net/icradius/files/icradiusd.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# radiusd Start the radius daemon.
-
-NAME1=radiusd
-NAME2=radwatch
-
-ARGS="-y -p 1645"
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
- echo "$0: Cannot determine the PREFIX" >&2
- exit 1
-fi
-
-RADIUSD=${PREFIX}/sbin/${NAME1}
-WATCHER=${PREFIX}/sbin/${NAME2}
-
-test -f $RADIUSD || exit 0
-
-case "$1" in
- start)
- if [ ! -f /var/log/radutmp ]
- then
- :>/var/log/radutmp
- fi
- if [ -x $WATCHER ]
- then
- echo -n ' radwatch'
- $WATCHER $RADIUSD $ARGS
- else
- echo -n ' radiusd'
- $RADIUSD $ARGS
- fi
- ;;
- stop)
- if [ -x $WATCHER ]
- then
- echo -n ' radwatch'
- kill -TERM `cat /var/run/$NAME2.pid`
- else
- kill -TERM `cat /var/run/$NAME1.pid`
- echo -n ' radiusd'
- fi
- ;;
- reload|force-reload)
- echo "Reloading radiusd configuration files."
- kill -HUP `cat /var/run/$NAME1.pid`
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "Usage: `basename $0` {start|stop|reload|restart}"
- exit 1
-esac
-
-exit 0
diff --git a/net/icradius/files/patch-raddb::dictionary b/net/icradius/files/patch-raddb::dictionary
deleted file mode 100644
index 8e4c2fd..0000000
--- a/net/icradius/files/patch-raddb::dictionary
+++ /dev/null
@@ -1,11 +0,0 @@
---- raddb/dictionary.old Tue Mar 7 09:57:19 2000
-+++ raddb/dictionary Wed Jan 17 17:22:35 2001
-@@ -158,7 +158,8 @@
- VALUE Service-Type Outbound-User 5
- VALUE Service-Type Administrative-User 6
- VALUE Service-Type NAS-Prompt-User 7
- VALUE Service-Type Call-Check 10
-+VALUE Service-Type Auth-Only 8
-
- # Framed Protocols
-
diff --git a/net/icradius/files/patch-raddb::dictionary.cisco b/net/icradius/files/patch-raddb::dictionary.cisco
deleted file mode 100644
index f1cc583..0000000
--- a/net/icradius/files/patch-raddb::dictionary.cisco
+++ /dev/null
@@ -1,10 +0,0 @@
---- raddb/dictionary.cisco.old Wed Apr 7 04:34:53 1999
-+++ raddb/dictionary.cisco Thu Nov 2 09:30:04 2000
-@@ -42,6 +42,7 @@
- ATTRIBUTE Cisco-Call-Filter 243 integer Cisco
- ATTRIBUTE Cisco-Idle-Limit 244 integer Cisco
- ATTRIBUTE Cisco-Xmit-Rate 255 integer Cisco
-+ATTRIBUTE Cisco-Line-Name 65538 string Cisco
-
- VALUE Cisco-Disconnect-Cause Unknown 2
- VALUE Cisco-Disconnect-Cause CLID-Authentication-Failure 4
diff --git a/net/icradius/files/patch-scripts::radius.cgi b/net/icradius/files/patch-scripts::radius.cgi
deleted file mode 100644
index 387f31f..0000000
--- a/net/icradius/files/patch-scripts::radius.cgi
+++ /dev/null
@@ -1,29 +0,0 @@
---- scripts/radius.cgi.orig Tue Jun 26 23:44:45 2001
-+++ scripts/radius.cgi Thu Jul 5 18:03:08 2001
-@@ -54,8 +54,8 @@
- my $radhost = 'radius.mydomain.com'; # radius host (if $authentication_type is 2)
- my $radsecret = ''; # radius secret (if $authentication_type is 2)
- my $highlight = 'lightblue'; # highlight color of tables
--my $fontname = 'Comic Sans MS'; # default font
--my $fontsize = '8'; # default font size
-+my $fontname = 'Helvetica'; # default font
-+my $fontsize = '12'; # default font size
-
- use IC::Radius;
- my $radius = new IC::Radius;
-@@ -1613,6 +1613,7 @@
- print q! selected! if (exists $selected_options->{$option});
- print qq!>$option\n!;
- }
-+ print "</select>\n";
-
- print qq~
- <tr><td><br></td></tr>
-@@ -3007,6 +3008,7 @@
- }
-
- my $session = $query->cookie(-name => $cookie_name);
-+ $session = "" if ( !defined($session) );
-
- open SESSIONS, "<$sessions_file" or do {
- &print_header; terminal_error("Unable to open file $sessions_file: $!\n");
diff --git a/net/icradius/files/patch-scripts::radius.db b/net/icradius/files/patch-scripts::radius.db
deleted file mode 100644
index 1aece3f..0000000
--- a/net/icradius/files/patch-scripts::radius.db
+++ /dev/null
@@ -1,38 +0,0 @@
---- scripts/radius.db.old Thu Jun 15 23:20:48 2000
-+++ scripts/radius.db Wed Jan 17 13:05:15 2001
-@@ -74,7 +74,7 @@
- id int(10) DEFAULT '0' NOT NULL auto_increment,
- UserName varchar(30) DEFAULT '' NOT NULL,
- Attribute varchar(30),
-- Value varchar(40),
-+ Value varchar(40) binary,
- PRIMARY KEY (id),
- KEY UserName (UserName)
- );
-@@ -86,7 +86,7 @@
- id int(10) DEFAULT '0' NOT NULL auto_increment,
- GroupName varchar(20) DEFAULT '' NOT NULL,
- Attribute varchar(40),
-- Value varchar(40),
-+ Value varchar(40) binary,
- PRIMARY KEY (id),
- KEY GroupName (GroupName)
- );
-@@ -98,7 +98,7 @@
- id int(10) DEFAULT '0' NOT NULL auto_increment,
- GroupName varchar(20) DEFAULT '' NOT NULL,
- Attribute varchar(40),
-- Value varchar(40),
-+ Value varchar(128),
- PRIMARY KEY (id),
- KEY GroupName (GroupName)
- );
-@@ -110,7 +110,7 @@
- id int(10) DEFAULT '0' NOT NULL auto_increment,
- UserName varchar(30) DEFAULT '' NOT NULL,
- Attribute varchar(30),
-- Value varchar(40),
-+ Value varchar(128),
- PRIMARY KEY (id),
- KEY UserName (UserName)
- );
diff --git a/net/icradius/files/patch-scripts::radwatch b/net/icradius/files/patch-scripts::radwatch
deleted file mode 100644
index 830beb1..0000000
--- a/net/icradius/files/patch-scripts::radwatch
+++ /dev/null
@@ -1,55 +0,0 @@
---- scripts/radwatch.orig Sat Jun 9 02:02:03 2001
-+++ scripts/radwatch Thu Jul 5 16:00:31 2001
-@@ -8,9 +8,9 @@
- #
-
- RWLOG="/var/log/radwatch.log" # Use "/dev/null" for no logging
--RWCMD="/usr/local/sbin/radiusd -y" # Path to radiusd + run-time arguments
--RWRCP="foo@bar.com" # Recipient for alerts. Comment out to disable
--RWINT=10 # Time in seconds between process list polls
-+RWCMD="%%PREFIX%%/sbin/radiusd" # Path to radiusd + run-time arguments
-+#RWRCP="foo@bar.com" # Recipient for alerts. Comment out to disable
-+RWINT=8 # Time in seconds between process list polls
-
- UNAME=`uname`
-
-@@ -35,7 +35,16 @@
- ;;
- esac
-
-+# get the path to the radiusd
-+if [ "$1" ] && [ -x "$1" ]
-+then
-+ RWCMD=$1
-+ shift
-+fi
-+
- (
-+trap "" HUP TSTP
-+
- while :
- do
-
-@@ -54,16 +63,21 @@
- fi
-
- if [ $COUNT -lt 2 ]; then
-+ sleep 3
- STAMP=`date "+%m/%d/%y %H:%M:%S"`
- ALERT="$COUNT processes. Restarting ICRADIUS."
- echo "$STAMP `basename $0`: $ALERT" >> $RWLOG
- if [ "$RWRCP" != "" ]; then
- echo "`basename $0`: $ALERT" | mail -s "ICRADIUS Restarted" $RWRCP
- fi
-- kill $PIDS 2>/dev/null; $RWCMD
-+ kill $PIDS 2>/dev/null; $RWCMD $*
- fi
-
- sleep $RWINT
-
- done
- ) &
-+
-+echo "$!" > /var/run/radwatch.pid
-+
-+sleep 1
diff --git a/net/icradius/files/patch-src::Make.inc b/net/icradius/files/patch-src::Make.inc
deleted file mode 100644
index 369e33a..0000000
--- a/net/icradius/files/patch-src::Make.inc
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Make.inc.orig Wed Jun 6 23:21:33 2001
-+++ src/Make.inc Tue Jun 26 12:43:50 2001
-@@ -4,7 +4,7 @@
- #
- #
-
--RADIUS_DIR = /etc/raddb
-+RADIUS_DIR = ${PREFIX}/etc/raddb
-
- SERVER_OBJS = radiusd.o dict.o files.o filters.o util.o md5.o attrprint.o \
- acct.o radius.o pam.o log.o version.o proxy.o \
-@@ -92,8 +92,8 @@
- install -d $(SBINDIR)
- install -d $(BINDIR)
- install -d $(RADIUS_DIR)
-- install -m 755 -s radiusd $(SBINDIR)/radiusd
-- install -m 755 checkrad.pl $(SBINDIR)/checkrad
-+ install -c -m 755 -s radiusd $(SBINDIR)/radiusd
-+ install -c -m 755 checkrad.pl $(SBINDIR)/checkrad
- # Install the config files
- @echo "Creating/updating files in $(RADIUS_DIR)"; \
- cd ../raddb; \
diff --git a/net/icradius/files/patch-src::Makefile.BSD b/net/icradius/files/patch-src::Makefile.BSD
deleted file mode 100644
index aff6922..0000000
--- a/net/icradius/files/patch-src::Makefile.BSD
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.BSD.old Sat Oct 21 23:28:04 2000
-+++ src/Makefile.BSD Wed Oct 25 12:51:01 2000
-@@ -4,7 +4,7 @@
- #
-
- CC = gcc
--CFLAGS = -I/usr/local/include -Wall -g -DBSD -DNOSHADOW
--LDFLAGS = -L/usr/local/lib/mysql # -s #tatic
-+CFLAGS += -I${LOCALBASE}/include -DNOSHADOW -DBSD -DRADIUS_DIR=\"${PREFIX}/etc/raddb\"
-+LDFLAGS += -L${LOCALBASE}/lib/mysql -s #tatic
- LIBS = -lmysqlclient -lm
- LCRYPT = -lcrypt
diff --git a/net/icradius/files/patch-src::auth.c b/net/icradius/files/patch-src::auth.c
deleted file mode 100644
index 17a8c99..0000000
--- a/net/icradius/files/patch-src::auth.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/auth.c.old Tue Sep 5 23:16:10 2000
-+++ src/auth.c Fri Jan 5 10:14:11 2001
-@@ -420,7 +420,7 @@
- /*
- * Plain text password.
- */
-- snprintf(dbpass, 128, " Password should be '%s'", password_pair->strvalue);
-+ strncpy(dbpass," Password mismatch",128);
- if (password_pair == NULL ||
- strcmp(password_pair->strvalue, string)!=0)
- result = -1;
diff --git a/net/icradius/files/patch-src::checkrad.pl b/net/icradius/files/patch-src::checkrad.pl
deleted file mode 100644
index 2477517..0000000
--- a/net/icradius/files/patch-src::checkrad.pl
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/checkrad.pl.orig Thu Oct 26 07:35:29 2000
-+++ src/checkrad.pl Wed Jul 4 16:43:11 2001
-@@ -35,17 +35,17 @@
- # $naspass is the location of your NAS admin password file
- #
-
--$prefix = "/usr/local";
-+$prefix = "%%PREFIX%%";
- $localstatedir = "/var";
- $logdir = "${localstatedir}/log";
--$sysconfdir = "/etc";
-+$sysconfdir = "${prefix}/etc";
- $raddbdir = "${sysconfdir}/raddb";
-
- $debug = "";
- #$debug = "$logdir/checkrad.log";
-
--$snmpget = "/usr/bin/snmpget";
--$snmpwalk = "/usr/bin/snmpwalk";
-+$snmpget = "${prefix}/bin/snmpget";
-+$snmpwalk = "${prefix}/bin/snmpwalk";
- $rusers = "/usr/bin/rusers";
- $naspass = "$raddbdir/naspasswd";
-
diff --git a/net/icradius/files/patch-src::conf.h b/net/icradius/files/patch-src::conf.h
deleted file mode 100644
index e712123..0000000
--- a/net/icradius/files/patch-src::conf.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/conf.h.old Wed Mar 8 07:12:21 2000
-+++ src/conf.h Tue Dec 19 09:14:49 2000
-@@ -1,6 +1,6 @@
- /* Default Database File Names */
-
--#define RADIUS_DIR "/etc/raddb"
-+/* #define RADIUS_DIR "/etc/raddb" */
- #define RADACCT_DIR "/var/log/radacct"
- #define RADLOG_DIR "/var/log"
-
diff --git a/net/icradius/files/patch-src::mysql.c b/net/icradius/files/patch-src::mysql.c
deleted file mode 100644
index 1b0fe81..0000000
--- a/net/icradius/files/patch-src::mysql.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/mysql.c.orig Thu Jun 14 23:32:02 2001
-+++ src/mysql.c Wed Jun 27 11:22:09 2001
-@@ -443,7 +443,7 @@
- #if defined(F_LOCK) && !defined(BSD)
- (void)lockf((int)mysqlfile, (int)F_LOCK, (off_t)SQL_LOCK_LEN);
- #else
-- (void)flock(mysqlfile, LOCK_EX);
-+ (void)flock(fileno(mysqlfile), LOCK_EX);
- #endif
- }
-
-@@ -1463,8 +1463,6 @@
-
- char querystr[2048];
- SQL_ROW row;
-- char opts1[32];
-- char opts2[32];
- REALM *c;
-
- realm_free(realms);
-@@ -1483,11 +1481,11 @@
- return -1;
- }
-
-- opts1[0] = opts2[0] = 0;
- c->realm[0] = 0;
- c->server[0] = 0;
- c->striprealm = 1;
- c->dohints = 0;
-+ c->loglocal = 0;
-
- if (c->realm != NULL)
- strNcpy(c->realm, row[0], sizeof(c->realm));
-@@ -1503,12 +1501,9 @@
- c->auth_port = strtol(row[3], NULL, 0);
- c->acct_port = c->auth_port + 1;
- if (row[4] != NULL) {
-- sscanf(row[4], "%31s%31s", opts1, opts2);
--
-- c->striprealm = strcmp(opts1, "nostrip") != 0 &&
-- strcmp(opts2, "nostrip") != 0;
-- c->dohints = strcmp(opts1, "hints") == 0 ||
-- strcmp(opts2, "hints") == 0;
-+ c->striprealm = strstr(row[4], "nostrip") == NULL;
-+ c->dohints = strstr(row[4], "hints") != NULL;
-+ c->loglocal = strstr(row[4], "loglocal") != NULL;
- }
-
- c->next = realms;
diff --git a/net/icradius/files/patch-src::radiusd.c b/net/icradius/files/patch-src::radiusd.c
deleted file mode 100644
index 14aea15..0000000
--- a/net/icradius/files/patch-src::radiusd.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/radiusd.c.old Wed Sep 13 23:45:42 2000
-+++ src/radiusd.c Thu Jan 25 17:51:17 2001
-@@ -429,7 +429,7 @@
- if(pid > 0) {
- exit(0);
- }
--#if defined(__linux__) || defined(__svr4__) || defined(__hpux__)
-+#if defined(__linux__) || defined(__svr4__) || defined(__hpux__) || defined(__FreeBSD__)
- setsid();
- #endif
- }
-@@ -577,6 +577,10 @@
- * Relay reply back to original NAS.
- *
- */
-+int rad_accounting_sql(AUTH_REQ *, int, char *, SQLSOCK *);
-+int rad_accounting_file(AUTH_REQ *, int, char *);
-+
-+
- int radrespond(AUTH_REQ *authreq, int activefd, SQLSOCK *acctsock) {
- int dospawn;
- FUNP fun;
-@@ -603,8 +607,22 @@
- namepair = pairfind(authreq->request, PW_USER_NAME);
- if (namepair == NULL)
- break;
-- if (proxy_send(authreq, activefd) != 0)
-+ if ((e = proxy_send(authreq, activefd)) != 0){
-+ REALM *realm = NULL;
-+
-+ if( (authreq->code == PW_ACCOUNTING_REQUEST) &&
-+ (e != -1) && (realm = realm_find(authreq->realm)) ) {
-+ if( realm->loglocal ){
-+ extern char *accounting_method;
-+
-+ if(strchr(accounting_method, 'f') != NULL)
-+ rad_accounting_file(authreq, 1, NULL);
-+ if(strchr(accounting_method, 's') != NULL)
-+ rad_accounting_sql(authreq, 1, NULL, acctsock);
-+ }
-+ }
- return 0;
-+ }
- break;
-
- case PW_AUTHENTICATION_ACK:
diff --git a/net/icradius/files/patch-src::radiusd.h b/net/icradius/files/patch-src::radiusd.h
deleted file mode 100644
index 12dd9d9..0000000
--- a/net/icradius/files/patch-src::radiusd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/radiusd.h.old Tue Sep 5 05:50:25 2000
-+++ src/radiusd.h Thu Jan 25 14:53:27 2001
-@@ -123,6 +123,7 @@
- int acct_port;
- int striprealm;
- int dohints;
-+ int loglocal;
- struct realm *next;
- } REALM;
-
diff --git a/net/icradius/files/pcisco-raddb::dictionary.cisco_my b/net/icradius/files/pcisco-raddb::dictionary.cisco_my
deleted file mode 100644
index 60869da..0000000
--- a/net/icradius/files/pcisco-raddb::dictionary.cisco_my
+++ /dev/null
@@ -1,31 +0,0 @@
---- raddb/dictionary.cisco_my.old Thu Jan 1 05:00:00 1970
-+++ raddb/dictionary.cisco_my Thu Nov 2 09:30:53 2000
-@@ -0,0 +1,28 @@
-+# Extra attributes sent by the Cisco, if you configure
-+# "radius-server vsa accounting" (requires IOS11.2+).
-+# (Removed VENDOR tag - dosn't work for some IOSes)
-+ATTRIBUTE Cisco-Multilink-ID 187 integer
-+ATTRIBUTE Cisco-Num-In-Multilink 188 integer
-+ATTRIBUTE Cisco-Pre-Input-Octets 190 integer
-+ATTRIBUTE Cisco-Pre-Output-Octets 191 integer
-+ATTRIBUTE Cisco-Pre-Input-Packets 192 integer
-+ATTRIBUTE Cisco-Pre-Output-Packets 193 integer
-+ATTRIBUTE Cisco-Maximun-Time 194 integer
-+ATTRIBUTE Cisco-Disconnect-Cause 195 integer
-+ATTRIBUTE Cisco-Data-Rate 197 integer
-+ATTRIBUTE Cisco-PreSession-Time 198 integer
-+ATTRIBUTE Cisco-PW-Lifetime 208 integer
-+ATTRIBUTE Cisco-IP-Direct 209 integer
-+ATTRIBUTE Cisco-PPP-VJ-Slot-Comp 210 integer
-+ATTRIBUTE Cisco-PPP-Async-Map 212 integer
-+ATTRIBUTE Cisco-IP-Pool-Definition 217 integer
-+ATTRIBUTE Cisco-Asing-IP-Pool 218 integer
-+ATTRIBUTE Cisco-Route-IP 228 integer
-+ATTRIBUTE Cisco-Link-Compression 233 integer
-+ATTRIBUTE Cisco-Target-Util 234 integer
-+ATTRIBUTE Cisco-Maximun-Channels 235 integer
-+ATTRIBUTE Cisco-Data-Filter 242 integer
-+ATTRIBUTE Cisco-Call-Filter 243 integer
-+ATTRIBUTE Cisco-Idle-Limit 244 integer
-+ATTRIBUTE Cisco-Xmit-Rate 255 integer
-+ATTRIBUTE Cisco-Line-Name 65538 string
diff --git a/net/icradius/files/pcisco-scripts::radius.cgi b/net/icradius/files/pcisco-scripts::radius.cgi
deleted file mode 100644
index 83d31e5..0000000
--- a/net/icradius/files/pcisco-scripts::radius.cgi
+++ /dev/null
@@ -1,106 +0,0 @@
---- scripts/radius.cgi.orig Wed Jul 18 16:03:17 2001
-+++ scripts/radius.cgi Wed Jul 18 15:30:03 2001
-@@ -2283,7 +2283,7 @@
- <select name="terminate_cause">
- <option value=''>
- ~;
-- my $terminate_causes = $radius->fetch_attribute_values('Acct-Terminate-Cause');
-+ my $terminate_causes = $radius->fetch_attribute_values('Cisco-Disconnect-Cause');
- foreach my $cause (@$terminate_causes) {
- print qq!<option value="$cause"!;
- print q! selected! if ($terminate_cause eq $cause);
-@@ -2334,7 +2334,10 @@
- $sql .= " AND radacct.NASPortId = '$nas_port'" if $nas_port;
- $sql .= " AND radacct.NASPortType = '$nas_port_type'" if $nas_port_type;
- $sql .= " AND radacct.FramedIPAddress = '$framed_ipaddr'" if $framed_ipaddr;
-- $sql .= " AND radacct.AcctTerminateCause = '$terminate_cause'" if $terminate_cause;
-+ if( $terminate_cause ){
-+ my %list = &get_attr_list('Cisco-Disconnect-Cause');
-+ $sql .= " AND radacct.CiscoDisconnectCause = \"".$list{$terminate_cause}."\"";
-+ }
-
- $sql .= " ORDER BY radacct.UserName, radacct.AcctStartTime DESC";
-
-@@ -2427,7 +2430,13 @@
-
- my $session = $radius->fetch_session_info($radacctid);
-
-- print qq~
-+ my $NASPortType = &get_attr($session->{NASPortType},"NAS-Port-Type");
-+ my $AcctAuthentic = &get_attr($session->{AcctAuthentic},"Acct-Authentic");
-+ my $CiscoDisconnectCause = &get_attr($session->{CiscoDisconnectCause},"Cisco-Disconnect-Cause");
-+ my $ServiceType = &get_attr($session->{ServiceType},"Service-Type");
-+ my $FramedProtocol = &get_attr($session->{FramedProtocol},"Framed-Protocol");
-+
-+ print qq~
- <center>
- <table cellspacing="4" cellpadding="2" border="1" cols="2">
- <tr><th bgcolor="$highlight">Attribute</th><th bgcolor="$highlight">Value</th></tr>
-@@ -2436,24 +2445,23 @@
- <tr><td align="center">Realm</td><td align="center">$session->{Realm}</td></tr>
- <tr><td align="center">NAS-IP-Address</td><td align="center">$session->{NASIPAddress}</td></tr>
- <tr><td align="center">NAS-Port-Id</td><td align="center">$session->{NASPortId}</td></tr>
-- <tr><td align="center">NAS-Port-Type</td><td align="center">$session->{NASPortType}</td></tr>
-+ <tr><td align="center">NAS-Port-Type</td><td align="center">$NASPortType</td></tr>
- <tr><td align="center">Acct-Start-Time</td><td align="center">$session->{AcctStartTime}</td></tr>
- <tr><td align="center">Acct-Stop-Time</td><td align="center">$session->{AcctStopTime}</td></tr>
- <tr><td align="center">Acct-Session-Time</td><td align="center">$session->{AcctSessionTime}</td></tr>
-- <tr><td align="center">Acct-Authentic</td><td align="center">$session->{AcctAuthentic}</td></tr>
-- <tr><td align="center">Connect-Info</td><td align="center">$session->{ConnectInfo}</td></tr>
-+ <tr><td align="center">Acct-Authentic</td><td align="center">$AcctAuthentic</td></tr>
- <tr><td align="center">Acct-Input-Octets</td><td align="center">$session->{AcctInputOctets}</td></tr>
- <tr><td align="center">Acct-Output-Octets</td><td align="center">$session->{AcctOutputOctets}</td></tr>
-- <tr><td align="center">Called-Station-Id</td><td align="center">$session->{CalledStationId}</td></tr>
-- <tr><td align="center">Calling-Station-Id</td><td align="center">$session->{CallingStationId}</td></tr>
-- <tr><td align="center">Acct-Terminate-Cause</td><td align="center">$session->{AcctTerminateCause}</td></tr>
-- <tr><td align="center">Service-Type</td><td align="center">$session->{ServiceType}</td></tr>
-- <tr><td align="center">Framed-Protocol</td><td align="center">$session->{FramedProtocol}</td></tr>
-+ <tr><td align="center">Cisco-Disconnect-Cause</td><td align="center">$CiscoDisconnectCause</td></tr>
-+ <tr><td align="center">Service-Type</td><td align="center">$ServiceType</td></tr>
-+ <tr><td align="center">Framed-Protocol</td><td align="center">$FramedProtocol</td></tr>
- <tr><td align="center">Framed-IP-Address</td><td align="center">$session->{FramedIPAddress}</td></tr>
- <tr><td align="center">Acct-Start-Delay-Time</td><td align="center">$session->{AcctStartDelay}</td></tr>
- <tr><td align="center">Acct-Stop-Delay-Time</td><td align="center">$session->{AcctStopDelay}</td></tr>
-- </table>
-- </center>
-+ <tr><td align="center">Cisco-Data-Rate</td><td align="center">$session->{CiscoDataRate}</td></tr>
-+ <tr><td align="center">Cisco-Xmit-Rate</td><td align="center">$session->{CiscoXmitRate}</td></tr>
-+ <tr><td align="center">Calling-Station-Id</td><td align="center">$session->{CallingStationId}</td></tr>
-+ <tr><td align="center">Called-Station-Id</td><td align="center">$session->{CalledStationId}</td></tr></table></center>
- ~;
- }
-
-@@ -3160,3 +3168,33 @@
-
- unlink $tmp_sessions_file;
- }
-+
-+# Get attribute description
-+sub get_attr {
-+ my( $attr ) = shift;
-+ my( $attr_name) = shift;
-+ my( $sth ) =
-+ $radius->{dbh}->prepare("SELECT Value from dictionary WHERE
-+ Type='VALUE' AND Attribute='$attr_name' AND
-+ Format='$attr'");
-+ $sth->execute || &terminal_error;
-+ my @row = $sth->fetchrow_array;
-+ $sth->finish;
-+
-+ return (( $#row >= 0 )? $row[0]:$attr);
-+}
-+
-+# Make a list of values of the specified attribute
-+sub get_attr_list {
-+ my( $attr ) = shift;
-+ my( %list, @row );
-+ my( $sth ) =
-+ $radius->{dbh}->prepare("SELECT Value,Format FROM dictionary WHERE
-+ Type='VALUE' AND Attribute='$attr'");
-+ $sth->execute || &terminal_error;
-+ while( @row = $sth->fetchrow_array ){
-+ $list{$row[0]}=$row[1];
-+ }
-+ $sth->finish;
-+ return %list;
-+}
diff --git a/net/icradius/files/pcisco-scripts::radius.db b/net/icradius/files/pcisco-scripts::radius.db
deleted file mode 100644
index 008eccb..0000000
--- a/net/icradius/files/pcisco-scripts::radius.db
+++ /dev/null
@@ -1,34 +0,0 @@
---- scripts/radius.db.old Thu Jun 15 23:20:48 2000
-+++ scripts/radius.db Wed Jan 17 13:05:15 2001
-@@ -42,22 +42,23 @@
- Realm varchar(30) DEFAULT '',
- NASIPAddress varchar(15) DEFAULT '' NOT NULL,
- NASPortId int(12),
-- NASPortType varchar(32),
-+ NASPortType int(12),
- AcctStartTime datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
- AcctStopTime datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
- AcctSessionTime int(12),
-- AcctAuthentic varchar(32),
-- ConnectInfo varchar(32),
-+ AcctAuthentic int(12),
- AcctInputOctets int(12),
- AcctOutputOctets int(12),
-- CalledStationId varchar(10) DEFAULT '' NOT NULL,
-- CallingStationId varchar(10) DEFAULT '' NOT NULL,
-- AcctTerminateCause varchar(32) DEFAULT '' NOT NULL,
-- ServiceType varchar(32),
-- FramedProtocol varchar(32),
-+ CiscoDisconnectCause int(12),
-+ ServiceType int(12),
-+ FramedProtocol int(12),
- FramedIPAddress varchar(15) DEFAULT '' NOT NULL,
- AcctStartDelay int(12),
- AcctStopDelay int(12),
-+ CiscoDataRate int(12),
-+ CiscoXmitRate int(12),
-+ CallingStationID varchar(30) DEFAULT '',
-+ CalledStationID varchar(30) DEFAULT '',
- PRIMARY KEY (RadAcctId),
- KEY UserName (UserName),
- KEY FramedIPAddress (FramedIPAddress),
diff --git a/net/icradius/files/pcisco-src::acct.c b/net/icradius/files/pcisco-src::acct.c
deleted file mode 100644
index c9782bf..0000000
--- a/net/icradius/files/pcisco-src::acct.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/acct.c.orig Tue Jun 12 07:31:23 2001
-+++ src/acct.c Tue Jun 26 17:00:10 2001
-@@ -84,7 +84,7 @@
- struct stat backup;
- SQLREC backuprecord = {"", "", "", "", 0, "", "", 0, "", 0, "", "", 0, 0, "", "", "", "", "", "", 0};
- #endif
-- SQLREC sqlrecord = {"", "", "", "", 0, "", "", 0, "", 0, "", "", 0, 0, "", "", "", "", "", "", 0};
-+ SQLREC sqlrecord = {"", "", "", "", 0, 0, 0, "", 0, 0, 0, 0, 0, 0, 0, "", 0, 0, "", "", 0};
- VALUE_PAIR *pair;
- int ret = 0;
-
-@@ -111,18 +111,11 @@
- break;
-
- case PW_NAS_PORT_TYPE:
-- valbuf = (char *)dict_valgetname(pair->lvalue, pair->name);
-- if(valbuf != (char *)NULL) {
-- strncpy(sqlrecord.NASPortType, valbuf, SQLBIGREC);
-- }
-+ sqlrecord.NASPortType = pair->lvalue;
- break;
-
- case PW_ACCT_STATUS_TYPE:
- sqlrecord.AcctStatusTypeId = pair->lvalue;
-- valbuf = (char *)dict_valgetname(pair->lvalue, pair->name);
-- if(valbuf != (char *)NULL) {
-- strncpy(sqlrecord.AcctStatusType, valbuf, SQLBIGREC);
-- }
- break;
-
- case PW_ACCT_SESSION_TIME:
-@@ -130,16 +123,9 @@
- break;
-
- case PW_ACCT_AUTHENTIC:
-- valbuf = (char *)dict_valgetname(pair->lvalue, pair->name);
-- if(valbuf != (char *)NULL) {
-- strncpy(sqlrecord.AcctAuthentic, valbuf, SQLBIGREC);
-- }
-+ sqlrecord.AcctAuthentic = pair->lvalue;
- break;
-
-- case PW_CONNECT_INFO:
-- strncpy(sqlrecord.ConnectInfo, pair->strvalue, SQLBIGREC);
-- break;
--
- case PW_ACCT_INPUT_OCTETS:
- sqlrecord.AcctInputOctets = pair->lvalue;
- break;
-@@ -148,33 +134,32 @@
- sqlrecord.AcctOutputOctets = pair->lvalue;
- break;
-
-- case PW_CALLED_STATION_ID:
-- strncpy(sqlrecord.CalledStationId, pair->strvalue, SQLLILREC);
-- break;
-+ case PW_CISCO_DISCONNECT_CAUSE:
-+ sqlrecord.CiscoDisconnectCause = pair->lvalue;
-+ break;
-
-- case PW_CALLING_STATION_ID:
-- strncpy(sqlrecord.CallingStationId, pair->strvalue, SQLLILREC);
-- break;
-+ case PW_CISCO_DATA_RATE:
-+ sqlrecord.CiscoDataRate = pair->lvalue;
-+ break;
-
-- case PW_ACCT_TERMINATE_CAUSE:
-- valbuf = (char *)dict_valgetname(pair->lvalue, pair->name);
-- if(valbuf != (char *)NULL) {
-- strncpy(sqlrecord.AcctTerminateCause, valbuf, SQLBIGREC);
-- }
-+ case PW_CISCO_XMIT_RATE:
-+ sqlrecord.CiscoXmitRate = pair->lvalue;
- break;
-
-+ case PW_CALLED_STATION_ID:
-+ strncpy(sqlrecord.CalledStationID, pair->strvalue, SQLBIGREC);
-+ break;
-+
-+ case PW_CALLING_STATION_ID:
-+ strncpy(sqlrecord.CallingStationID, pair->strvalue, SQLBIGREC);
-+ break;
-+
- case PW_SERVICE_TYPE:
-- valbuf = (char *)dict_valgetname(pair->lvalue, pair->name);
-- if(valbuf != (char *)NULL) {
-- strncpy(sqlrecord.ServiceType, valbuf, SQLBIGREC);
-- }
-+ sqlrecord.ServiceType = pair->lvalue;
- break;
-
- case PW_FRAMED_PROTOCOL:
-- valbuf = (char *)dict_valgetname(pair->lvalue, pair->name);
-- if(valbuf != (char *)NULL) {
-- strncpy(sqlrecord.FramedProtocol, valbuf, SQLBIGREC);
-- }
-+ sqlrecord.FramedProtocol = pair->lvalue;
- break;
-
- case PW_FRAMED_IP_ADDRESS:
diff --git a/net/icradius/files/pcisco-src::mysql.c b/net/icradius/files/pcisco-src::mysql.c
deleted file mode 100644
index 16f6dddf..0000000
--- a/net/icradius/files/pcisco-src::mysql.c
+++ /dev/null
@@ -1,199 +0,0 @@
---- src/mysql.c.old Sat Oct 21 23:28:04 2000
-+++ src/mysql.c Thu Jan 25 14:51:54 2001
-@@ -471,7 +475,15 @@
- /* The Terminal server informed us that it was rebooted
- * STOP all records from this NAS */
-
-- sprintf(querystr, "UPDATE %s SET AcctStopTime='%s', AcctSessionTime=unix_timestamp('%s') - unix_timestamp(AcctStartTime), AcctTerminateCause='%s', AcctStopDelay = %ld WHERE AcctSessionTime=0 AND AcctStopTime=0 AND NASIPAddress= '%s' AND AcctStartTime <= '%s'", sql->config->sql_acct_table, sqlrecord->AcctTimeStamp, sqlrecord->AcctTimeStamp, sqlrecord->AcctTerminateCause, sqlrecord->AcctDelayTime, sqlrecord->NASIPAddress, sqlrecord->AcctTimeStamp);
-+ sprintf(querystr, "UPDATE %s SET AcctStopTime='%s', "
-+ "AcctSessionTime=unix_timestamp('%s') - unix_timestamp(AcctStartTime),"
-+ " CiscoDisconnectCause = %lu, AcctStopDelay = %lu "
-+ "WHERE AcctSessionTime=0 AND AcctStopTime=0 AND "
-+ "NASIPAddress= '%s' AND AcctStartTime <= '%s'",
-+ sql->config->sql_acct_table, sqlrecord->AcctTimeStamp,
-+ sqlrecord->AcctTimeStamp,
-+ sqlrecord->CiscoDisconnectCause, sqlrecord->AcctDelayTime,
-+ sqlrecord->NASIPAddress, sqlrecord->AcctTimeStamp);
-
- if (!sql_query(socket, querystr)) {
- log(L_ERR, "Acct: Couldn't update SQL accounting after NAS reboot - %s", sql_error(socket));
-@@ -488,7 +500,12 @@
- }
-
- if (sqlrecord->AcctStatusTypeId == PW_STATUS_ALIVE) {
-- sprintf(querystr, "UPDATE %s SET FramedIPAddress = '%s' WHERE AcctSessionId = '%s' AND UserName = '%s' AND NASIPAddress= '%s'", sql->config->sql_acct_table, sqlrecord->FramedIPAddress, sqlrecord->AcctSessionId, sqlrecord->UserName, sqlrecord->NASIPAddress);
-+ sprintf(querystr, "UPDATE %s SET FramedIPAddress = '%s' "
-+ "WHERE AcctSessionId = '%s' AND UserName = '%s' AND "
-+ "NASIPAddress= '%s'",
-+ sql->config->sql_acct_table, sqlrecord->FramedIPAddress,
-+ sqlrecord->AcctSessionId, sqlrecord->UserName,
-+ sqlrecord->NASIPAddress);
- if (!sql_query(socket, querystr)) {
- log(L_ERR, "Acct: Couldn't update SQL accounting for ALIVE packet - %s", sql_error(socket));
- ret = 0;
-@@ -507,7 +524,10 @@
- if(sqlrecord->AcctStatusTypeId == PW_STATUS_START) {
-
- /* Set start time on record with only a stop record */
-- snprintf(querystr, 2048, "UPDATE %s SET AcctStartTime = '%s', AcctStartDelay = %ld WHERE AcctSessionId = '%s' AND UserName = '%s' AND NASIPAddress = '%s' AND NASPortId = '%ld'",
-+ snprintf(querystr, 2048,
-+ "UPDATE %s SET AcctStartTime = '%s', AcctStartDelay = %lu "
-+ "WHERE AcctSessionId = '%s' AND UserName = '%s' AND "
-+ "NASIPAddress = '%s' AND NASPortId = %lu",
- sql->config->sql_acct_table,
- sqlrecord->AcctTimeStamp,
- sqlrecord->AcctDelayTime,
-@@ -527,24 +547,34 @@
- if (num == 0 && ret > 0) {
-
- /* Insert new record with blank stop time until we receive the stop record */
-- snprintf(querystr, 2048, "INSERT INTO %s VALUES (0, '%s', '%s', '%s', '%s', %ld, '%s', '%s', 0, 0, '%s', '%s', 0, 0, '%s', '%s', '', '%s', '%s', '%s', %ld, 0)",
-- sql->config->sql_acct_table,
-- sqlrecord->AcctSessionId,
-- sqlrecord->UserName,
-- sqlrecord->Realm,
-- sqlrecord->NASIPAddress,
-- sqlrecord->NASPortId,
-- sqlrecord->NASPortType,
-- sqlrecord->AcctTimeStamp,
-- sqlrecord->AcctAuthentic,
-- sqlrecord->ConnectInfo,
-- sqlrecord->CalledStationId,
-- sqlrecord->CallingStationId,
-- sqlrecord->ServiceType,
-- sqlrecord->FramedProtocol,
-- sqlrecord->FramedIPAddress,
-- sqlrecord->AcctDelayTime
-- );
-+ snprintf(querystr, 2048, "INSERT INTO %s VALUES "
-+ "(0, '%s', '%s', '%s', "
-+ "'%s', %lu, %lu, "
-+ "'%s', 0, 0, "
-+ "%lu, 0, 0, '', "
-+ "%lu, %lu, '', "
-+ "%lu, 0, 0, 0, '%s', '%s')",
-+ sql->config->sql_acct_table,
-+
-+ sqlrecord->AcctSessionId,
-+ sqlrecord->UserName,
-+ sqlrecord->Realm,
-+
-+ sqlrecord->NASIPAddress,
-+ sqlrecord->NASPortId,
-+ sqlrecord->NASPortType,
-+
-+ sqlrecord->AcctTimeStamp,
-+
-+ sqlrecord->AcctAuthentic,
-+
-+ sqlrecord->ServiceType,
-+ sqlrecord->FramedProtocol,
-+
-+ sqlrecord->AcctDelayTime,
-+
-+ sqlrecord->CallingStationID,
-+ sqlrecord->CalledStationID );
-
- if (!sql_query(socket, querystr)) {
- log(L_ERR, "Acct: Couldn't insert SQL accounting START record - %s", sql_error(socket));
-@@ -563,7 +593,10 @@
- else
- sprintf(authstr, "UserName = '%s'", sqlrecord->UserName);
-
-- sprintf(querystr, "SELECT RadAcctId FROM %s WHERE AcctSessionId='%s' AND NASIPAddress='%s' AND %s", sql->config->sql_acct_table, sqlrecord->AcctSessionId, sqlrecord->NASIPAddress, authstr);
-+ sprintf(querystr, "SELECT RadAcctId FROM %s WHERE "
-+ "AcctSessionId='%s' AND NASIPAddress='%s' AND %s",
-+ sql->config->sql_acct_table,
-+ sqlrecord->AcctSessionId, sqlrecord->NASIPAddress, authstr);
- sql_select_query(socket, querystr);
- num = sql_num_rows(socket);
- sql_finish_select_query(socket);
-@@ -571,19 +604,25 @@
- if (num > 0) {
-
- /* Set stop time on matching record with start time */
-- snprintf(querystr, 2048, "UPDATE %s SET AcctStopTime = '%s', AcctSessionTime = '%lu', AcctInputOctets = '%lu', AcctOutputOctets = '%lu', AcctTerminateCause = '%s', AcctStopDelay = %ld WHERE AcctSessionId = '%s' AND UserName = '%s' AND NASIPAddress = '%s' AND NASPortId = '%ld'",
-- sql->config->sql_acct_table,
-- sqlrecord->AcctTimeStamp,
-- sqlrecord->AcctSessionTime,
-- sqlrecord->AcctInputOctets,
-- sqlrecord->AcctOutputOctets,
-- sqlrecord->AcctTerminateCause,
-- sqlrecord->AcctDelayTime,
-- sqlrecord->AcctSessionId,
-- sqlrecord->UserName,
-- sqlrecord->NASIPAddress,
-- sqlrecord->NASPortId
-- );
-+ snprintf(querystr, 2048,
-+ "UPDATE %s SET "
-+ "AcctStopTime = '%s', AcctSessionTime = %lu, "
-+ "AcctInputOctets = %lu, AcctOutputOctets = %lu, "
-+ "FramedIPAddress = '%s', CiscoDisconnectCause = %lu, "
-+ "AcctStopDelay = %lu, "
-+ "CiscoDataRate = %lu, CiscoXmitRate = %lu, "
-+ "CallingStationID = '%s', CalledStationID = '%s' "
-+ "WHERE AcctSessionId = '%s' AND UserName = '%s' AND "
-+ "NASIPAddress = '%s' AND NASPortId = %lu",
-+ sql->config->sql_acct_table,
-+ sqlrecord->AcctTimeStamp, sqlrecord->AcctSessionTime,
-+ sqlrecord->AcctInputOctets, sqlrecord->AcctOutputOctets,
-+ sqlrecord->FramedIPAddress, sqlrecord->CiscoDisconnectCause,
-+ sqlrecord->AcctDelayTime,
-+ sqlrecord->CiscoDataRate, sqlrecord->CiscoXmitRate,
-+ sqlrecord->CallingStationID,sqlrecord->CalledStationID,
-+ sqlrecord->AcctSessionId, sqlrecord->UserName,
-+ sqlrecord->NASIPAddress, sqlrecord->NASPortId);
-
- if (!sql_query(socket, querystr)) {
- log(L_ERR, "Acct: Couldn't update SQL accounting STOP record - %s", sql_error(socket));
-@@ -607,28 +646,42 @@
- #endif /* CISCO_ACCOUNTING_HACK */
-
- /* Insert record with no start time until matching start record comes */
-- snprintf(querystr, 2048, "INSERT INTO %s VALUES (0, '%s', '%s', '%s', '%s', %ld, '%s', 0, '%s', '%lu', '%s', '%s', '%lu', '%lu', '%s', '%s', '%s', '%s', '%s', '%s', 0, %ld)",
-+ snprintf(querystr, 2048, "INSERT INTO %s VALUES "
-+ "(0, '%s', '%s', '%s', "
-+ "'%s', %lu, %lu, "
-+ "0, '%s', %lu, "
-+ "%lu, %lu, %lu, "
-+ "%lu, %lu, "
-+ "%lu, '%s', "
-+ "0, %lu, %lu, %lu, '%s', '%s')",
- sql->config->sql_acct_table,
-+
- sqlrecord->AcctSessionId,
- sqlrecord->UserName,
- sqlrecord->Realm,
-+
- sqlrecord->NASIPAddress,
- sqlrecord->NASPortId,
- sqlrecord->NASPortType,
-+
- sqlrecord->AcctTimeStamp,
- sqlrecord->AcctSessionTime,
-+
- sqlrecord->AcctAuthentic,
-- sqlrecord->ConnectInfo,
- sqlrecord->AcctInputOctets,
- sqlrecord->AcctOutputOctets,
-- sqlrecord->CalledStationId,
-- sqlrecord->CallingStationId,
-- sqlrecord->AcctTerminateCause,
-+
-+ sqlrecord->CiscoDisconnectCause,
- sqlrecord->ServiceType,
-+
- sqlrecord->FramedProtocol,
- sqlrecord->FramedIPAddress,
-- sqlrecord->AcctDelayTime
-- );
-+
-+ sqlrecord->AcctDelayTime,
-+ sqlrecord->CiscoDataRate,
-+ sqlrecord->CiscoXmitRate,
-+ sqlrecord->CallingStationID,
-+ sqlrecord->CalledStationID);
-
- if (!sql_query(socket, querystr)) {
- log(L_ERR, "Acct: Couldn't insert SQL accounting STOP record - %s", sql_error(socket));
diff --git a/net/icradius/files/pcisco-src::proxy.c b/net/icradius/files/pcisco-src::proxy.c
deleted file mode 100644
index f847eee..0000000
--- a/net/icradius/files/pcisco-src::proxy.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/proxy.c.old Sat Oct 21 23:28:04 2000
-+++ src/proxy.c Tue Mar 6 18:18:14 2001
-@@ -44,6 +44,7 @@
- PW_SESSION_TIMEOUT,
- PW_IDLE_TIMEOUT,
- PW_PORT_LIMIT,
-+ PW_CISCO_MAXIMUM_TIME,
- 0,
- };
-
diff --git a/net/icradius/files/pcisco-src::radius.h b/net/icradius/files/pcisco-src::radius.h
deleted file mode 100644
index 4835711..0000000
--- a/net/icradius/files/pcisco-src::radius.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/radius.h.old Tue Nov 21 23:35:27 2000
-+++ src/radius.h Tue Mar 6 18:16:58 2001
-@@ -126,6 +126,13 @@
-
- #define PW_RADIUS_OPERATOR 100
-
-+#define PW_CISCO_MAXIMUM_TIME 194
-+#define PW_CISCO_DISCONNECT_CAUSE 195
-+#define PW_CISCO_DATA_RATE 197
-+#define PW_CISCO_XMIT_RATE 255
-+
-+
-+
- #define PW_FALL_THROUGH 500
- #define PW_ADD_PORT_TO_IP_ADDRESS 501
- #define PW_EXEC_PROGRAM 502
diff --git a/net/icradius/files/pcisco-src::radiusd.h b/net/icradius/files/pcisco-src::radiusd.h
deleted file mode 100644
index 2e24d8a..0000000
--- a/net/icradius/files/pcisco-src::radiusd.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/radiusd.h.old Tue Sep 5 05:50:25 2000
-+++ src/radiusd.h Thu Jan 25 14:53:27 2001
-@@ -142,21 +142,21 @@
- char Realm[SQLBIGREC];
- char NASIPAddress[SQLLILREC];
- unsigned long NASPortId;
-- char NASPortType[SQLBIGREC];
-- char AcctStatusType[SQLBIGREC];
-+ unsigned long NASPortType;
- unsigned int AcctStatusTypeId;
- char AcctTimeStamp[20];
- unsigned long AcctSessionTime;
-- char AcctAuthentic[SQLBIGREC];
-- char ConnectInfo[SQLBIGREC];
-+ unsigned long AcctAuthentic;
- unsigned long AcctInputOctets;
- unsigned long AcctOutputOctets;
-- char CalledStationId[SQLLILREC];
-- char CallingStationId[SQLLILREC];
-- char AcctTerminateCause[SQLBIGREC];
-- char ServiceType[SQLBIGREC];
-- char FramedProtocol[SQLBIGREC];
-+ unsigned long CiscoDisconnectCause;
-+ unsigned long ServiceType;
-+ unsigned long FramedProtocol;
- char FramedIPAddress[SQLLILREC];
-+ unsigned long CiscoDataRate;
-+ unsigned long CiscoXmitRate;
-+ char CallingStationID[SQLBIGREC];
-+ char CalledStationID[SQLBIGREC];
- unsigned long AcctDelayTime;
- } SQLREC;
-
diff --git a/net/icradius/pkg-comment b/net/icradius/pkg-comment
deleted file mode 100644
index 4f7a452..0000000
--- a/net/icradius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A variant of Cistron RADIUS, but with a MySQL backend
diff --git a/net/icradius/pkg-descr b/net/icradius/pkg-descr
deleted file mode 100644
index e927982..0000000
--- a/net/icradius/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-IC-RADIUS is a variant of Cistron RADIUS, but with a MySQL backend.
-
-It includes a web interface for user management, as well as a CGI for
-your users to check their usage history. IC-RADIUS conforms to RFC 2865
-and RFC 2866. IC-RADIUS is released under the GPL.
-
-Features
-
- Database backend - Easy intergration to other programs
- Web based management tools
- Simultaneous restrictions
- Roaming support via realms
- Scalable to large environments
- Compatable with the FreeRADIUS rlm_sql_mysql table structure
-
-Source code is developed and mainained by InnerCite (http://www.innercite.com)
-
-Projects Home:
-
-WWW: http://icradius.hislora.com.au/
-
-Additional changes:
-1) Add missed loglocal feature for radius proxy.
-2) Add special hacks to make it CISCO-specific (optional, see Makefile).
diff --git a/net/icradius/pkg-message b/net/icradius/pkg-message
deleted file mode 100644
index 0334273..0000000
--- a/net/icradius/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-Please, read ${PREFIX}/share/doc/icradius/README. It
-helps you to configure your system.
-
-Don't forget to make required changes to
-${PREFIX}/etc/raddb/radius.conf.
-
-Also you need to customize your database. Required files
-are placed into ${PREFIX}/share/icradius.
-
-To use multiple login limitations, you need to install
-some additional ports:
-
-${PORTSDIR}/net/p5-Net-Telnet
-${PORTSDIR}/net/p5-SNMP_Session
diff --git a/net/icradius/pkg-plist b/net/icradius/pkg-plist
deleted file mode 100644
index 3b47649..0000000
--- a/net/icradius/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-etc/raddb/radius.conf.sample
-etc/rc.d/icradiusd.sh
-sbin/radiusd
-sbin/checkrad
-sbin/radwatch
-%%CGI%%libexec/radius.cgi
-%%CGI%%libexec/usage.cgi
-%%PORTDOCS%%share/doc/icradius/COPYING
-%%PORTDOCS%%share/doc/icradius/COPYRIGHT.Cistron
-%%PORTDOCS%%share/doc/icradius/COPYRIGHT.ICRADIUS
-%%PORTDOCS%%share/doc/icradius/COPYRIGHT.Livingston
-%%PORTDOCS%%share/doc/icradius/README
-%%PORTDOCS%%share/doc/icradius/README.Y2K
-%%PORTDOCS%%share/doc/icradius/README.cisco
-%%PORTDOCS%%share/doc/icradius/README.hints
-%%PORTDOCS%%share/doc/icradius/README.proxy
-%%PORTDOCS%%share/doc/icradius/README.simul
-%%PORTDOCS%%share/doc/icradius/FAQ
-%%PORTDOCS%%share/doc/icradius/THANKS
-%%PORTDOCS%%share/doc/icradius/TODO
-share/icradius/raddb/dictionary
-share/icradius/raddb/dictionary.ascend
-share/icradius/raddb/dictionary.cisco
-share/icradius/raddb/dictionary.compat
-share/icradius/raddb/dictionary.foundry
-share/icradius/raddb/dictionary.livingston
-share/icradius/raddb/dictionary.merit
-share/icradius/raddb/dictionary.redback
-share/icradius/raddb/dictionary.shiva
-share/icradius/raddb/dictionary.tunnel
-share/icradius/raddb/dictionary.usr
-share/icradius/raddb/dictionary.versanet
-share/icradius/raddb/huntgroups
-share/icradius/scripts/images/l.gif
-share/icradius/scripts/images/lc.gif
-share/icradius/scripts/images/r.gif
-share/icradius/scripts/images/rc.gif
-share/icradius/scripts/images/rr.gif
-share/icradius/scripts/radwho
-share/icradius/scripts/radlast
-share/icradius/scripts/radius.db
-share/icradius/scripts/usonlineconv.pl
-share/icradius/scripts/userimport.pl
-share/icradius/scripts/userexport.pl
-share/icradius/scripts/syncaccounting.pl
-share/icradius/scripts/radiusfixup.pl
-share/icradius/scripts/dictimport.pl
-share/icradius/scripts/acctsummarize.pl
-share/icradius/scripts/acctimport.pl
-share/icradius/scripts/README
-share/icradius/scripts/acctexport.pl
-@dirrm etc/raddb
-%%PORTDOCS%%@dirrm share/doc/icradius
-@dirrm share/icradius/scripts/images
-@dirrm share/icradius/scripts
-@dirrm share/icradius/raddb
-@dirrm share/icradius
diff --git a/net/p5-IC-Radius/Makefile b/net/p5-IC-Radius/Makefile
deleted file mode 100644
index 7870f38..0000000
--- a/net/p5-IC-Radius/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for: p5-IC-Radius
-# Date created: 27 Jun 2001
-# Whom: Sergey N. Voronkov <serg@tmn.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME= IC-Radius
-PORTVERSION= 0.4
-CATEGORIES= net perl5
-MASTER_SITES= ftp://ftp.innercite.com/pub/perl/
-PKGNAMEPREFIX= p5-
-
-MAINTAINER= ports@FreeBSD.org
-
-BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-PERL_CONFIGURE= yes
-
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3= IC::Radius.3
-
-.include <bsd.port.mk>
diff --git a/net/p5-IC-Radius/distinfo b/net/p5-IC-Radius/distinfo
deleted file mode 100644
index 725f2e6..0000000
--- a/net/p5-IC-Radius/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (IC-Radius-0.4.tar.gz) = ecd7e2c89caac91c9167fd2c128b6d19
diff --git a/net/p5-IC-Radius/files/patch-Radius.pm b/net/p5-IC-Radius/files/patch-Radius.pm
deleted file mode 100644
index d29bc3d..0000000
--- a/net/p5-IC-Radius/files/patch-Radius.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- Radius.pm.orig Thu Jul 5 14:20:54 2001
-+++ Radius.pm Thu Jul 5 14:30:19 2001
-@@ -1038,7 +1038,7 @@
-
- =item * I<sample>
-
-- $radius->insert_realm('flintstones.com', 'bedrock.com', 'bedrock', '1812', 'nostrip');
-+ $radius->update_realm('flintstones.com', 'bedrock.com', 'bedrock', '1812', 'nostrip');
-
- =item * I<return value>
-
-@@ -1778,7 +1778,7 @@
-
- sub fetch_realm_options {
- my $self = shift;
-- my @options = ('nostrip', 'dohints');
-+ my @options = ('nostrip', 'dohints', 'loglocal');
-
- return @options if wantarray;
- return \@options;
diff --git a/net/p5-IC-Radius/pkg-comment b/net/p5-IC-Radius/pkg-comment
deleted file mode 100644
index 5b0f134..0000000
--- a/net/p5-IC-Radius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl5 extension for ICRADIUS Interface Module
diff --git a/net/p5-IC-Radius/pkg-descr b/net/p5-IC-Radius/pkg-descr
deleted file mode 100644
index 8c246d7..0000000
--- a/net/p5-IC-Radius/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-IC::Radius - ICRADIUS Interface Module
-
-The IC::Radius module provides functions for interfacing with ICRADIUS.
-
-### ICRADIUS Interface Module
-### Drew Wilder-Goodwin
-### 2001-04-24
diff --git a/net/p5-IC-Radius/pkg-plist b/net/p5-IC-Radius/pkg-plist
deleted file mode 100644
index 780346a..0000000
--- a/net/p5-IC-Radius/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/perl5/site_perl/%%PERL_VER%%/IC/Radius.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IC/Radius/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IC/Radius
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IC 2>/dev/null || true
diff --git a/net/radius/Makefile b/net/radius/Makefile
deleted file mode 100644
index dab41df..0000000
--- a/net/radius/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for: radius
-# Date created: 4. July 1996
-# Whom: torstenb@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= radius-basic
-PORTVERSION= 3.6B2
-CATEGORIES= net
-DISTNAME= radius.${PORTVERSION}.basic
-
-MAINTAINER= ports@FreeBSD.org
-
-# restrictive copyright in several files, e.g., "src/sendserver.c"
-RESTRICTED= redistribution in binary only
-NO_CDROM= not allowed to charge fee for redistribution
-
-FORBIDDEN= "Remotely exploitable buffer overflow"
-
-NO_WRKSUBDIR= yes
-INSTALL_TARGET= install-all
-MAKE-FLAGS+= -DPREFIX=${PREFIX}
-MAN5= authfile.5 clients.5 dictionary.5 engine.config.5 \
- radius.fsm.5 users.5 vendors.5
-MAN8= builddbm.8 dnscheck.8 radcheck.8 radiusd.8 radpwtst.8
-
-pre-install:
- @${MKDIR} ${PREFIX}/lib/radius/db ${PREFIX}/lib/radius/acct
-
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE="Goto radius\' website: \
- \"http://www.interlinknetworks.com/downloads/\#freeware\" \
- to get more info on downloading the tarball, then place \
- ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} and run make again"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/radius/distinfo b/net/radius/distinfo
deleted file mode 100644
index 4fd3d00..0000000
--- a/net/radius/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (radius.3.6B2.basic.tar.gz) = 39a2e5962103ef4a56ae8c2a2590177e
diff --git a/net/radius/files/patch-aa b/net/radius/files/patch-aa
deleted file mode 100644
index 4d54d6f..0000000
--- a/net/radius/files/patch-aa
+++ /dev/null
@@ -1,131 +0,0 @@
---- Makefile~ Mon Jul 13 17:19:54 1998
-+++ Makefile Thu Sep 17 18:27:41 1998
-@@ -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}/bin
-+MAN_INSDIR = ${PREFIX}/man
-+RADDB_INSDIR = ${PREFIX}/lib/radius/db
-+RADACCT_INSDIR = ${PREFIX}/lib/radius/acct
- # 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.
-@@ -67,8 +67,8 @@
-
- # 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=\"/usr/bin/gzip\"
-+COMPRESS_ARGS = -DCOMPRESS_ARGS=\"-9\"
-
- # Define SRV to hold any combination of server names you'd like to override:
- #SRV3 = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\"
-@@ -122,17 +122,22 @@
- # radiusd -- the default
- #
- #--------------------------------------------------------------------------
-+.if !defined(MAKE_EBONES)
- DEFS = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF)
- RADLIBS =
- INCS =
-+.endif
-
- #
- # mkerb
- #
- #--------------------------------------------------------------------------
--#DEFS = -DHAVE_SETVBUF -DM_KERB -DNOSHADOW $(MERIT) $(STUFF)
--#RADLIBS = /usr/kerberos/lib/libkrb.a /usr/kerberos/lib/libdes.a
--#INCS = -I/usr/kerberos/include
-+.if defined(MAKE_EBONES)
-+DEFS = -DHAVE_SETVBUF -DM_KERB -DKRB_INSTANCE=\"$(KRB_INSTANCE)\" \
-+ -DNOSHADOW $(MERIT) $(STUFF)
-+RADLIBS = -lkrb -ldes
-+INCS = -I/usr/include
-+.endif
-
- #
- # akerb
-@@ -228,12 +233,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 ...]]
-@@ -316,14 +321,17 @@
- #
- #--------------------------------------------------------------------------
-
--#CC = cc
--#CFLAGS = -O $(DEFS) $(INCS)
--#LDFLAGS =
--#LIBS = -lcrypt -lcompat
--#UTILS = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK)
--#RANLIB = ranlib
--#INSTALL = /usr/bin/install
--
-+CC = cc
-+CFLAGS += -DRADIUS_DIR=\"${RADDB_INSDIR}\" -DDEFAULT_DIR2=\"${RADDB_INSDIR}\" \
-+ -DRADACCT_DIR=\"${PREFIX}/lib/radius/acct\" \
-+ -DRADIUS_COMPRESS=\"/usr/bin/gzip\" \
-+ $(DEFS) $(INCS)
-+LDFLAGS =
-+LIBS = -lcrypt -lcompat
-+UTILS = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK)
-+RANLIB = ranlib
-+INSTALL = /usr/bin/install -c
-+
- #
- # AIX 3.2.5 (if using xlc(1) add -D_ALL_SOURCE to CFLAGS below)
- # May need '-qchars=signed' added to CFLAGS below to fix bug in wait status.
-@@ -684,21 +692,21 @@
- /bin/mkdir -p $(RADDB_INSDIR) ;\
- fi
- $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/authfile \
-- $(RADDB_INSDIR)/authfile
-+ $(RADDB_INSDIR)/authfile.sample
- $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/clients \
-- $(RADDB_INSDIR)/clients
-+ $(RADDB_INSDIR)/clients.sample
- $(INSTALL) $(M) 755 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/conversion.pl \
-- $(RADDB_INSDIR)/conversion.pl
-+ $(RADDB_INSDIR)/conversion.pl.sample
- $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/dictionary \
-- $(RADDB_INSDIR)/dictionary
-+ $(RADDB_INSDIR)/dictionary.sample
- $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/engine.config \
-- $(RADDB_INSDIR)/engine.config
-+ $(RADDB_INSDIR)/engine.config.sample
- $(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/users \
-- $(RADDB_INSDIR)/users
-+ $(RADDB_INSDIR)/users.sample
- $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/vendors \
-- $(RADDB_INSDIR)/vendors
-+ $(RADDB_INSDIR)/vendors.sample
- $(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/xas.fsm \
-- $(RADDB_INSDIR)/xas.fsm
-+ $(RADDB_INSDIR)/xas.fsm.sample
- -if [ ! -d $(RADACCT_INSDIR) ] ;\
- then \
- /bin/mkdir -p $(RADACCT_INSDIR) ;\
diff --git a/net/radius/files/patch-ab b/net/radius/files/patch-ab
deleted file mode 100644
index f466a5b..0000000
--- a/net/radius/files/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/radiusd.c.orig Mon Jul 27 15:52:37 1998
-+++ src/radiusd.c Sun Dec 10 17:04:17 2000
-@@ -793,6 +793,19 @@
- sigaction (SIGIOT, &action, NULL); /* Perhaps also known as SIGABRT ! */
- sigaction (SIGFPE, &action, NULL);
-
-+ /* the max number of open files should never be used as an argument
-+ * for select(). On systems that support more than 256 open files
-+ * select() is not able to handle that many fd's.
-+ * In this case the max. number of fd's for select should not be
-+ * set to the maximum number of descriptors.
-+ * Since I'm too lazy to correct the code I set dtablesize to
-+ * FD_SETSIZE. This is the only portable way to use select() on
-+ * all descriptors. See also "Advanced Programming in the Unix
-+ * Environment" (from W. Richard Stevens) and the BSD 4.4 manpage for
-+ * select(2).
-+ */
-+ dtablesize = FD_SETSIZE;
-+#ifdef BOGUS_CODE
- #ifdef _SC_OPEN_MAX
- if ((dtablesize = sysconf (_SC_OPEN_MAX)) == -1)
- {
-@@ -802,6 +815,7 @@
- #else /* Assume BSD */
- dtablesize = getdtablesize ();
- #endif /* _SC_OPEN_MAX */
-+#endif /* BOGUS_CODE */
-
- for (j = dtablesize; j >= 3; j--)
- {
-@@ -4467,7 +4481,7 @@
- while ((event = authreq->event_q) != (EVENT_ENT *) NULL)
- {
- authreq->event_q = event->next;
-- free_event_final (event);
-+ free_event (event);
- }
-
- while ((event = authreq->freed_events) != (EVENT_ENT *) NULL)
diff --git a/net/radius/files/patch-ac b/net/radius/files/patch-ac
deleted file mode 100644
index e8412b8..0000000
--- a/net/radius/files/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/krb_conf.h~ Tue May 12 21:37:13 1998
-+++ src/krb_conf.h Thu Sep 17 18:33:35 1998
-@@ -20,7 +20,7 @@
- #ifndef KRB_CONF_DEFS
- #define KRB_CONF_DEFS
-
--#include <mit-copyright.h>
-+/* #include <mit-copyright.h> */
-
- /* Byte ordering */
- extern int krbONE;
---- src/krb_get_in_tkt.c.orig Tue May 12 21:37:16 1998
-+++ src/krb_get_in_tkt.c Thu Sep 17 18:33:35 1998
-@@ -13,7 +13,7 @@
-
- #endif /* lint */
-
--#include <mit-copyright.h>
-+/* #include <mit-copyright.h> */
- #include <krb.h>
- #include <des.h>
-
---- src/mit_stringtokey.c.orig Tue May 12 21:37:17 1998
-+++ src/mit_stringtokey.c Thu Sep 17 18:33:35 1998
-@@ -29,7 +29,7 @@
-
- #endif /* lint */
-
--#include <mit-copyright.h>
-+/* #include <mit-copyright.h> */
- #include <stdio.h>
- #include <memory.h>
- #include <des.h>
---- src/prot.h.orig Tue May 12 21:37:13 1998
-+++ src/prot.h Thu Sep 17 18:33:35 1998
-@@ -11,7 +11,7 @@
- * Include file with authentication protocol information.
- */
-
--#include <mit-copyright.h>
-+/* #include <mit-copyright.h> */
-
- #include "krb_conf.h"
-
diff --git a/net/radius/files/patch-ad b/net/radius/files/patch-ad
deleted file mode 100644
index d6fe8e66..0000000
--- a/net/radius/files/patch-ad
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/rad.kerberos.c~ Fri Jun 26 00:40:50 1998
-+++ src/rad.kerberos.c Thu Sep 17 18:50:28 1998
-@@ -80,8 +80,8 @@
-
- #include <krb.h>
-
--static int krb_pass PROTO((AUTH_REQ *, int, char *,
-- int (*) (AUTH_REQ *, int, char *)));
-+static int krb_pass (AUTH_REQ *, int, char *,
-+ int (*) (AUTH_REQ *, int, char *));
-
- extern int debug_flag;
-
-@@ -225,8 +225,14 @@
- krbval = INTK_BADPW; /* Fail if type is bad somehow */
-
- /* get the ticket */
-- krbval = krb_get_in_tkt (userid, "", realm, "krbtgt", realm,
-+ krbval = krb_get_in_tkt (userid, KRB_INSTANCE, realm, "krbtgt", realm,
- DEFAULT_TKT_LIFE, passwd_to_key, NULL, passwd);
-+ /*
-+ * XXX
-+ * This can be spoofed fairly easily... Should attempt to authenticate
-+ * to some service on this machine (e.g., radius.thishost@REALM)
-+ * in order to ensure that the ticket we just got is really valid.
-+ */
- switch (krbval)
- {
- case INTK_OK:
-@@ -294,6 +300,37 @@
- krbval, userid, realm);
- break;
- }
-+#ifdef M_KERB
-+ /*
-+ * Ticket verification code based loosely on Berkeley klogin.c 8.3
-+ */
-+ if (krbreturn != EV_ACK) {
-+ dest_tkt();
-+ memset(passwd, 0, sizeof passwd);
-+ } else {
-+ struct sockaddr_in sin;
-+ char host[MAXHOSTNAMELEN], *p;
-+ AUTH_DAT authdata;
-+ KTEXT_ST ticket;
-+
-+ krb_get_local_addr(&sin);
-+ gethostname(host, sizeof host);
-+ if ((p = strchr(host, '.')) != 0)
-+ *p = '\0';
-+ krbval = krb_mk_req(&ticket, "radius", host, realm, 33);
-+ if (krbval == KSUCCESS) {
-+ krbval = krb_rd_req(&ticket, "radius", host,
-+ sin.sin_addr.s_addr, &authdata,
-+ "");
-+ }
-+ if (krbval != KSUCCESS) {
-+ logit(LOG_DAEMON, LOG_ERR,
-+ "Kerberos error verifying ticket for %s: %s",
-+ func, krb_err_txt[krbval]);
-+ krbreturn = EV_NAK;
-+ }
-+ }
-+#endif /* M_KERB */
-
- dest_tkt (); /* destroy the ticket */
- memset (passwd, 0, sizeof (passwd));
diff --git a/net/radius/files/patch-funcs.c b/net/radius/files/patch-funcs.c
deleted file mode 100644
index 1e230c8..0000000
--- a/net/radius/files/patch-funcs.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/funcs.c.orig Sun Aug 26 03:03:53 2001
-+++ src/funcs.c Sun Aug 26 03:14:07 2001
-@@ -8333,9 +8333,9 @@
- return 1;
- }
-
--/*The following two lines do not compile on Solaris or Linux or BSDI. */
--#if !(defined(sys5) || defined(linux) || defined (BSDI))
- close (fileno(fp));
-+/*The following two lines do not compile on Solaris or Linux or BSDI. */
-+#if !(defined(sys5) || defined(linux) || defined (BSDI) || defined (__FreeBSD__))
- fileno(fp) = STDERR_FILENO;
- #endif /* sys5 */
-
diff --git a/net/radius/pkg-comment b/net/radius/pkg-comment
deleted file mode 100644
index f8f1541..0000000
--- a/net/radius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A remote authentication server
diff --git a/net/radius/pkg-descr b/net/radius/pkg-descr
deleted file mode 100644
index 16bb3e6..0000000
--- a/net/radius/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-radiusd is a server that handles access-requests for user authentication
-from radius clients. These clients may be terminal servers, Network
-Access Servers or other RADIUS servers.
diff --git a/net/radius/pkg-plist b/net/radius/pkg-plist
deleted file mode 100644
index e95bd90..0000000
--- a/net/radius/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/dnscheck
-bin/radcheck
-bin/radpass
-bin/radpwtst
-@exec mkdir -p %D/lib/radius/acct
-lib/radius/db/authfile.sample
-lib/radius/db/clients.sample
-lib/radius/db/conversion.pl.sample
-lib/radius/db/dictionary.sample
-lib/radius/db/engine.config.sample
-lib/radius/db/users.sample
-lib/radius/db/vendors.sample
-lib/radius/db/xas.fsm.sample
-sbin/radiusd
-@dirrm lib/radius/db
-@dirrm lib/radius/acct
-@dirrm lib/radius
diff --git a/net/xtradius/Makefile b/net/xtradius/Makefile
deleted file mode 100644
index 8d9af03..0000000
--- a/net/xtradius/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# New ports collection makefile for: xtradius
-# Date created: 06 September 2000
-# Whom: pal@paladin7.net
-#
-# $FreeBSD$
-#
-
-PORTNAME= xtradius
-PORTVERSION= 1.0b3
-CATEGORIES= net
-MASTER_SITES= http://www.xtradius.com/files/stable/
-DISTNAME= xtradius-1.0beta3
-EXTRACT_SUFX= .tgz
-
-FORBIDDEN= "Remotely exploitable buffer overflow"
-
-MAINTAINER= pal@paladin7.net
-
-MAKEFILE= Makefile.BSD
-
-MAN1= radlast.1 radtest.1 raduse.1 radwho.1 radzap.1
-MAN5= clients.5rad naslist.5rad
-MAN8= radiusd.8 radwatch.8
-VARD= /var/log
-
-do-build:
- cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE}
-
-do-install:
- cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} install
- @${MKDIR} -m 700 ${VARD}/radacct
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Cistron ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.Livingston ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/INSTALL.OLD ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README.Y2K ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README.cisco ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README.pam ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README.proxy ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README.simul ${PREFIX}/share/doc/radiusd-xtradius
- ${INSTALL_DATA} ${WRKSRC}/doc/README.usersfile ${PREFIX}/share/doc/radiusd-xtradius
-.endif
- ${INSTALL_MAN} ${WRKSRC}/doc/radlast.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/radtest.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/raduse.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/radwho.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/radzap.1 ${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/clients.5rad ${MANPREFIX}/man/man5
- ${INSTALL_MAN} ${WRKSRC}/doc/naslist.5rad ${MANPREFIX}/man/man5
- ${INSTALL_MAN} ${WRKSRC}/doc/radiusd.8 ${MANPREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/doc/radwatch.8 ${MANPREFIX}/man/man8
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/contrib/pg_xtradius/users ${PREFIX}/etc/raddb/users.pg
- ${INSTALL_DATA} ${WRKSRC}/contrib/pg_xtradius/pg_auth.pl ${PREFIX}/etc/raddb
- ${INSTALL_DATA} ${WRKSRC}/contrib/pg_xtradius/pg_acct.pl ${PREFIX}/etc/raddb
- @${CHMOD} 555 ${PREFIX}/etc/raddb/pg_acct.pl ${PREFIX}/etc/raddb/pg_auth.pl
- @${CHOWN} root:wheel ${PREFIX}/etc/raddb/pg_acct.pl
- @${CHOWN} root:wheel ${PREFIX}/etc/raddb/pg_auth.pl
- @${SED} -e "s=!!PREFIX!!=${PREFIX}=g" ${FILESDIR}/radiusd.sh.tmpl \
- > ${PREFIX}/etc/rc.d/radiusd.sh
- @${CHMOD} 555 ${PREFIX}/etc/rc.d/radiusd.sh
- @${CHOWN} root:wheel ${PREFIX}/etc/rc.d/radiusd.sh
-.include <bsd.port.mk>
diff --git a/net/xtradius/distinfo b/net/xtradius/distinfo
deleted file mode 100644
index 6fd274c7e..0000000
--- a/net/xtradius/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (xtradius-1.0beta3.tgz) = b420be9e2f3d8bd0e96c27c439c50eb3
diff --git a/net/xtradius/files/patch-aa b/net/xtradius/files/patch-aa
deleted file mode 100644
index 70e63c8..0000000
--- a/net/xtradius/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/Makefile.BSD.orig Fri Aug 25 16:30:17 2000
-+++ src/Makefile.BSD Fri Aug 25 16:32:14 2000
-@@ -3,9 +3,9 @@
- #
- #
-
--CC = gcc
--CFLAGS = -Wall -g -DNOSHADOW -DXTRADIUS
--LDFLAGS = # -s #tatic
-+#CC = gcc
-+CFLAGS = -DNOSHADOW -DXTRADIUS
-+LDFLAGS = -s #static
- LIBS =
- LCRYPT = -lcrypt
-
-@@ -15,7 +15,7 @@
- #PAM = -DPAM
- #PAMLIB = -lpam
-
--BINDIR = /usr/local/bin
--SBINDIR = /usr/local/sbin
-+BINDIR = $(PREFIX)/bin
-+SBINDIR = $(PREFIX)/sbin
-
- .include "Make.inc"
diff --git a/net/xtradius/files/patch-ab b/net/xtradius/files/patch-ab
deleted file mode 100644
index 46d0606..0000000
--- a/net/xtradius/files/patch-ab
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/Make.inc.orig Mon Apr 3 11:00:59 2000
-+++ src/Make.inc Wed May 3 18:56:35 2000
-@@ -4,7 +4,7 @@
- #
- #
-
--RADIUS_DIR = /etc/raddb
-+RADIUS_DIR = ${PREFIX}/etc/raddb
-
- SERVER_OBJS = radiusd.o dict.o files.o util.o md5.o attrprint.o \
- acct.o radius.o pam.o log.o version.o proxy.o \
-@@ -111,21 +111,20 @@
-
- install:
- # Install the binaries
-- install -d $(SBINDIR)
-- install -d $(BINDIR)
-- install -d $(RADIUS_DIR)
-- install -m 755 -s radiusd $(SBINDIR)/radiusd
-- install -m 755 -s radwho $(BINDIR)
-- install -m 755 -s raduse $(BINDIR)
-- install -m 755 -s radzap $(BINDIR)
-- install -m 755 -s radtest $(BINDIR)
-- install -m 755 checkrad.pl $(SBINDIR)/checkrad
-- install -m 755 radlast $(BINDIR)
-+ ${INSTALL} -d $(RADIUS_DIR)
-+ ${BSD_INSTALL_PROGRAM} radiusd $(SBINDIR)/radiusd
-+ ${BSD_INSTALL_PROGRAM} radwho $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} raduse $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} radzap $(BINDIR)
-+ ${BSD_INSTALL_PROGRAM} radtest $(BINDIR)
-+ ${BSD_INSTALL_SCRIPT} ../scripts/radwatch ${SBINDIR}/radwatch
-+ ${BSD_INSTALL_SCRIPT} checkrad.pl $(SBINDIR)/checkrad
-+ ${BSD_INSTALL_SCRIPT} radlast $(BINDIR)
- # Install the config files
- @echo "Creating/updating files in $(RADIUS_DIR)"; \
- cd ../raddb; \
- for i in [a-c]* [e-z]*; do \
-- [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
-+ [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
- done; \
- for i in dictionary*; do \
- [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(RADIUS_DIR)/$$i; \
-@@ -133,8 +132,4 @@
- echo "** $(RADIUS_DIR)/$$i"; \
- nt=1; \
- fi; \
-- done; \
-- if [ "$$nt" ]; then \
-- echo "** The samples in ../raddb are newer than these files";\
-- echo "** Please investigate and copy manually if appropriate";\
-- fi
-+ done;
diff --git a/net/xtradius/files/patch-ac b/net/xtradius/files/patch-ac
deleted file mode 100644
index 0d4afe5..0000000
--- a/net/xtradius/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/conf.h Wed Sep 6 18:28:45 2000
-+++ conf.h Wed Sep 6 18:30:44 2000
-@@ -1,6 +1,6 @@
- /* Default Database File Names */
-
--#define RADIUS_DIR "/etc/raddb"
-+#define RADIUS_DIR "/usr/local/etc/raddb"
- #define RADLOG_DIR "/var/log"
-
- #ifdef aix
diff --git a/net/xtradius/files/patch-ad b/net/xtradius/files/patch-ad
deleted file mode 100644
index 226c7f8..0000000
--- a/net/xtradius/files/patch-ad
+++ /dev/null
@@ -1,129 +0,0 @@
---- src/radwho.c.orig Fri Feb 25 05:47:53 2000
-+++ src/radwho.c Wed May 3 18:43:24 2000
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
-+#include <sys/ioctl.h>
- #include <time.h>
- #include <ctype.h>
- #include <netinet/in.h>
-@@ -34,18 +35,21 @@
- * Header above output and format.
- */
- char *hdr1 =
--"Login Name What TTY When From Location";
--char *ufmt1 = "%-10.10s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.16s%s";
-+"Login Name What TTY When From Location";
-+char *ufmt1 = "%-16.16s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.*s%s";
- char *ufmt1r = "%s,%s,%s,%s,%s,%s,%s%s";
--char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.19s%s";
-+char *rfmt1 = "%-16.16s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.*s%s";
- char *rfmt1r = "%s,%s,%s,%s%d,%s,%s,%s%s";
-+#define FMT1_HOST_SIZE 13
-
- char *hdr2 =
--"Login Port What When From Location";
--char *ufmt2 = "%-10.10s %-6.6d %-7.7s %-13.13s %-10.10s %-.16s%s";
-+"Login Port What When From Location";
-+char *ufmt2 = "%-16.16s %-6.6d %-7.7s %-13.13s %-10.10s %-.*s%s";
- char *ufmt2r = "%s,%d,%s,%s,%s,%s%s";
--char *rfmt2 = "%-10.10s %s%-5d %-6.6s %-13.13s %-10.10s %-.28s%s";
-+char *rfmt2 = "%-16.16s %s%-5d %-6.6s %-13.13s %-10.10s %-.*s%s";
- char *rfmt2r = "%s,%s%d,%s,%s,%s,%s%s";
-+#define FMT2_HOST_SIZE 19
-+
-
- char *eol = "\n";
- NAS *naslist;
-@@ -301,7 +305,8 @@
- return tmp;
- }
- if (strncmp(tty, "cu", 2) == 0) {
-- return tmp + 2;
-+ sprintf(tmp, "%.15s", tty + 2);
-+ return tmp;
- }
- return "??";
- }
-@@ -363,6 +368,8 @@
- */
- int main(int argc, char **argv)
- {
-+ struct winsize ws;
-+ int extra_width = 0;
- FILE *fp;
- struct radutmp rt;
- struct utmp ut;
-@@ -378,6 +385,11 @@
- char *p, *q, *portind;
- int c, portno;
-
-+ ioctl(0, TIOCGWINSZ, &ws);
-+ if (ws.ws_col >= 80) {
-+ extra_width = ws.ws_col - 80;
-+ }
-+
- while((c = getopt(argc, argv, "flhnsipcr")) != EOF) switch(c) {
- case 'f':
- fingerd++;
-@@ -465,14 +477,17 @@
- while(fread(&ut, sizeof(ut), 1, fp) == 1) {
- #ifdef USER_PROCESS
- if (ut.ut_user[0] && ut.ut_line[0] &&
-- ut.ut_type == USER_PROCESS) {
-+ ut.ut_type == USER_PROCESS)
- #else
-- if (ut.ut_user[0] && ut.ut_line[0]) {
-+ if (ut.ut_user[0] && ut.ut_line[0])
- #endif
-- if (showname)
-+ {
-+ strncpy(inbuf, ut.ut_name, UT_NAMESIZE);
-+ inbuf[UT_NAMESIZE] = '\0';
-+ if (showname)
- printf((rawoutput == 0? ufmt1: ufmt1r),
-- ut.ut_name,
-- fullname(ut.ut_name),
-+ inbuf,
-+ fullname(inbuf),
- "shell",
- ttyshort(ut.ut_line),
- #ifdef __svr4__
-@@ -481,10 +496,11 @@
- dotime(ut.ut_time),
- #endif
- ut.ut_host,
-+ FMT1_HOST_SIZE + extra_width,
- myname, eol);
- else
- printf((rawoutput==0? ufmt2:ufmt2r),
-- ut.ut_name,
-+ inbuf,
- ttyshort(ut.ut_line),
- "shell",
- #ifdef __svr4__
-@@ -493,6 +509,7 @@
- dotime(ut.ut_time),
- #endif
- ut.ut_host,
-+ FMT2_HOST_SIZE + extra_width,
- myname, eol);
- }
- }
-@@ -537,6 +554,7 @@
- portind, portno,
- dotime(rt.time),
- nasname(ntohl(rt.nas_address)),
-+ FMT1_HOST_SIZE + extra_width,
- hostname(rt.framed_address), eol);
- else
- printf((rawoutput == 0? rfmt2: rfmt2r),
-@@ -545,6 +563,7 @@
- proto(rt.proto, rt.porttype),
- dotime(rt.time),
- nasname(ntohl(rt.nas_address)),
-+ FMT2_HOST_SIZE + extra_width,
- hostname(rt.framed_address), eol);
- }
- }
diff --git a/net/xtradius/files/radiusd.sh.tmpl b/net/xtradius/files/radiusd.sh.tmpl
deleted file mode 100644
index 1ced24d..0000000
--- a/net/xtradius/files/radiusd.sh.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-PREFIX=/usr/local/sbin
-
-case "$1" in
-
-start)
- if [ -x ${PREFIX}/radiusd ]
- then
- ${PREFIX}/radiusd -y &
- echo -n " radiusd"
- fi
- ;;
-
-stop)
- if [ -r /var/run/radiusd.pid ]
- then
- kill `cat /var/run/radiusd.pid` && echo -n " radiusd"
- fi
- ;;
-
-*)
- echo "usage: $0 {start|stop}" 1>&2
- exit 64
- ;;
-
-esac
-
diff --git a/net/xtradius/pkg-comment b/net/xtradius/pkg-comment
deleted file mode 100644
index 10e6873..0000000
--- a/net/xtradius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A RADIUS-compliant remote authentication and accouting server
diff --git a/net/xtradius/pkg-descr b/net/xtradius/pkg-descr
deleted file mode 100644
index a028890..0000000
--- a/net/xtradius/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-XtRadius is a freeware radius server implementation. The main feature is that it
-can handle user accounting and authentication informations via external fully
-configurable scripts.
-The XtRadius server is based on Cistron Radius 1.6.3. You can write script to
-make you own auth and/or accounting routines without having to patch the main
-server.
-
-WWW: http://www.xtradius.com/
diff --git a/net/xtradius/pkg-plist b/net/xtradius/pkg-plist
deleted file mode 100644
index 2891d8b..0000000
--- a/net/xtradius/pkg-plist
+++ /dev/null
@@ -1,48 +0,0 @@
-bin/radlast
-bin/radtest
-bin/raduse
-bin/radwho
-bin/radzap
-sbin/checkrad
-sbin/radiusd
-sbin/radwatch
-etc/raddb/clients
-etc/raddb/dictionary
-etc/raddb/dictionary.ascend
-etc/raddb/dictionary.cisco
-etc/raddb/dictionary.compat
-etc/raddb/dictionary.livingston
-etc/raddb/dictionary.shiva
-etc/raddb/dictionary.tunnel
-etc/raddb/dictionary.usr
-etc/raddb/dictionary.versanet
-etc/raddb/dictionary.xtradius
-etc/raddb/execparams
-etc/raddb/hints
-etc/raddb/huntgroups
-etc/raddb/naslist
-etc/raddb/naspasswd
-etc/raddb/realms
-etc/raddb/users
-etc/raddb/users.pg
-etc/raddb/pg_auth.pl
-etc/raddb/pg_acct.pl
-share/doc/radiusd-xtradius/COPYRIGHT.Cistron
-share/doc/radiusd-xtradius/COPYRIGHT.Livingston
-share/doc/radiusd-xtradius/ChangeLog
-share/doc/radiusd-xtradius/INSTALL.OLD
-share/doc/radiusd-xtradius/README
-share/doc/radiusd-xtradius/README.Y2K
-share/doc/radiusd-xtradius/README.cisco
-share/doc/radiusd-xtradius/README.pam
-share/doc/radiusd-xtradius/README.proxy
-share/doc/radiusd-xtradius/README.simul
-share/doc/radiusd-xtradius/README.usersfile
-etc/rc.d/radiusd.sh
-@exec mkdir -m 700 /var/log/radacct
-@dirrm etc/raddb
-@dirrm share/doc/radiusd-xtradius
-@unexec rm -f /var/log/radius.log
-@unexec rm -f /var/run/radiusd.pid
-@unexec rmdir /var/log/radacct
-@unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."
OpenPOWER on IntegriCloud