From: cmiller Date: Tue, 6 Mar 2001 23:44:50 +0000 (+0000) Subject: Changed comments calling the code Cistron to FreeRADIUS. Corrected some X-Git-Tag: release_0_1_0~169 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=5efe5131963f58c0a07a1d41adf912561dd768fa Changed comments calling the code Cistron to FreeRADIUS. Corrected some docs of factual errors. --- diff --git a/COPYRIGHT b/COPYRIGHT index 03f98dc..45803ca 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,11 @@ Most code in this package was written by Miquel van Smoorenburg - for Cistron Internet Services B.V. + for Cistron Internet Services B.V. A + significant fraction of the code was written by others for the + FreeRADIUS project. + + Copyright (C) 2000-2001 FreeRADIUS Project Copyright (C) 1997-1999 Cistron Internet Services B.V. The license for all source code and documentation except diff --git a/Make.inc.in b/Make.inc.in index e0b028d..064e76e 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -1,5 +1,5 @@ # -# Make.inc.in Common Makefile stuff for the cistron-radius package. +# Make.inc.in # # Version: $Id$ # diff --git a/Makefile b/Makefile index 430ca33..0b5394a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Makefile Makefile for the cistron-radius package. +# Makefile # # NOTE: This top-level Makefile must not # use GNU-make extensions. The lower ones can. diff --git a/README b/README index 032f4b0..c2e3893 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - debian/ Files to build a radiusd-cistron Debian package + debian/ Files to build a radiusd-freeradius Debian package doc/ Various snippets of documentation raddb/ Sample files for /etc/raddb scripts/ Sample scripts for startup and maintenance diff --git a/doc/ChangeLog b/doc/ChangeLog index b97566a..d476041 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ + +*** This file is incredibly ancient. Perhaps cvs logs would be your + cup of tea. - Chad Miller + + + + + 2000-10-17 Antonio Dias (accdias@sst.com.br) * doc/README.cisco updated (Chris Parker ) diff --git a/doc/Makefile b/doc/Makefile index 73c6a99..43744e7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -7,3 +7,5 @@ install: clean: +doc: + ( cd docsrc; make $@ ) diff --git a/doc/PAM b/doc/PAM index d2ba249..5764c66 100644 --- a/doc/PAM +++ b/doc/PAM @@ -5,8 +5,8 @@ 0. INTRODUCTION PAM support was done by Jeph Blaize. Miguel a.l. Paraz - ported it to Cistron-Radius. Chris Dent added the - Pam-Auth attribute. It is not complete yet but seems to work + ported it to FreeRADIUS' parent, Cistron-Radius. Chris Dent + added the Pam-Auth attribute. It is not complete yet but seems to work (for authentication only). 1. USAGE diff --git a/doc/README b/doc/README index 2e316a7..7831b29 100644 --- a/doc/README +++ b/doc/README @@ -1,17 +1,6 @@ -0. WARNING! - - FreeRadius now uses autoconf - some of the default directories - have changed! Configuration is now by default in /usr/local/etc/raddb, - and logfiles are in /usr/local/var/log/ .... - See 2. for more info. - 1. INTRO - This is version 0.1 of the FreeRadius daemon. - - *** THIS IS AN ALPHA VERSION! IT MIGHT NOT WORK *** - All code in this server was written from scratch. The server is mostly compatible with livingston radiusd-2.01 @@ -39,7 +28,7 @@ file if you already stripped them off in the "hints" file. The documentation of the Livingston server is available on the web at: - http://www.livingston.com/Tech/Docs/RADIUS/guide/ + Extra command line flags: o -y: log all login attempts in /var/log/radius.log, include (wrong) @@ -90,27 +79,20 @@ "update-rc.d radiusd defaults". o Start radiusd (using /etc/init.d/radiusd start if applicable). -3. USAGE - - You can use last -f /var/log/radwtmp to get last info on all users. - You can use "radwho" at any time to find out who's logged in. - If you want, you can install "radwho" as /usr/sbin/in.fingerd. - Also, the "raduse" program can be very useful to monitor your modem pool. - -4. CONFIGURATION FILES +3. CONFIGURATION FILES For every file there is a fully commented example file included, that explains what is does and how to use it. Read those sample files too! -4a. CLIENTS +3a. CLIENTS Make sure the clients (portmasters, Linux with portslave etc) are set up to use the host radiusd is running on as authentication and accounting host. Configure these clients to use a "radius secret password". For every client, also enter this "secret password" into the file /etc/raddb/clients. - See also the manual page for clients(5rad). + See also the manual page for clients(5). -4b. NASLIST +3b. NASLIST Every NAS (Network Access Server, also known as terminal server) should have an entry in this file with an abbreviated name and the type of NAS it @@ -134,7 +116,7 @@ NAS is a client and not every client is a NAS (this will start to make sense if you use radius proxy servers). -4c. NASPASSWD +3c. NASPASSWD If ``checkrad'' needs to login on your terminal server to check who is online on a certain port (i.e. it's not possible to use SNMP or @@ -143,14 +125,14 @@ This is normally ONLY needed for USR/3Com Total Control, NetServer and Cyclades PathRAS terminal servers! -4c. HINTS +3d. HINTS Customize the /etc/raddb/hints file. This file is used to give users a different login type based on a prefix/suffix of their loginname. For example, logging in as "user" may result in a rlogin session to a Unix system, and logging in as "Puser" could start a PPP session. -4d. HUNTGROUPS +3e. HUNTGROUPS This is the /etc/raddb/huntgroups file. Here you can define different huntgroups. These can be used to: @@ -161,7 +143,7 @@ for this is to give a user a static IP address based on the huntgroup / Point of Presence (s)he dials in to. -4e. USERS +3f. USERS With the original RADIUS server, every user had to be defined in this file. There could be one default entry, where you could for example @@ -179,7 +161,7 @@ The FreeRadius server does not trim any spaces from a username received from the portmaster (livingston does, in perl notation, $user =~ s/\s+.*//;) -4f. NEW RADIUS ATTRIBUTES (to be used in the USERS file). +3g. NEW RADIUS ATTRIBUTES (to be used in the USERS file). Name Type Descr. ---- ---- ------ @@ -241,22 +223,22 @@ Login-Time is "Al0800-1800" and she logs in at 17:30, Session-Timeout is set to 1800 seconds so that she is kicked off at 18:00. -5. LOG FILES +4. LOG FILES -5a. /var/log/radutmp +4a. /var/log/radutmp In this file the currently logged in users are held. The program "radwho" reads this file and gives you a summary. Rogue sessions can be deleted from this file with the "radzap" program. -5b. /var/log/radwtmp +4b. /var/log/radwtmp This file is "wtmp" compatible and keeps a history of all radius logins/ logouts. This file can be read with the "last" program, and other Unix accounting programs (such as "ac" and "sac") can be used to produce a summary. -5c. /var/log/radius.log +4c. /var/log/radius.log All RADIUS informational. diagnostic and error messages are logged in this file. If radiusd has been started with the "-y" flag, all logins @@ -265,7 +247,7 @@ logins will be logged as well. That's pretty dangerous though in case anyone unpriviliged ever manages to get access to this file! -5d. /var/log/radacct//detail +4d. /var/log/radacct//detail This is the original radius logfile, as written by all the livingston radius servers. It's only created if the directory /var/log/radacct exists. @@ -275,7 +257,7 @@ For more configuration options on the detail file please see README.rlm_detail as it expands upon this greatly. -6. MORE INFO, SUPPORT +5. MORE INFO, SUPPORT We know that the documentation provided is sparse. However it is not in the scope of the radius server to provide a guide as to how terminal @@ -283,20 +265,20 @@ The latest version of FreeRadius is always available through anonymous CVS from cvs.freeradius.org - for more info, see - http://www.freeradius.org/ + - There is a majordomo mailing list hosted by Cistron Internet Services. - This list is mainly meant for developers of FreeRadius - as soon - as we have a BETA version, there will be a freeradius-users list. - To subscribe to the developers list, send a message with "help" in the + There are two GNU Mailman mailing lists hosted by Cistron Internet Services: + one freeradius-devel list and one freeradius-users list. The devel list + is mainly meant for developers of FreeRadius. + To subscribe to either list, visit body to freeradius-devel-request@info.cistron.nl. You can browse the archive of this mailing list at - http://info.cistron.nl/archives/freeradius-devel/ + There are a few other mailing lists that might offer some help: There is a linux-radius list run by miguel a.l. paraz . - See http://www.iphil.net/~map/radius/ for details. + See for details. Then ofcourse for general RADIUS questions, especially if you are using Livingston / Lucent RABU equipment, there is the portmaster-radius mailing @@ -304,4 +286,5 @@ out how to subscribe. - README 0.1-alpha Miquel van Smoorenburg 21-Aug-1999 +$Date$ +Miquel van Smoorenburg 21-Aug-1999 diff --git a/doc/Simultaneous-Use b/doc/Simultaneous-Use index 2e820b1..79a4e7f 100644 --- a/doc/Simultaneous-Use +++ b/doc/Simultaneous-Use @@ -1,5 +1,5 @@ - Cistron-Radius and the Simultaneous-Use parameter. + FreeRADIUS server and the Simultaneous-Use parameter. 0. INTRODUCTION diff --git a/doc/cache b/doc/cache index 58dba2e..a7c88a0 100644 --- a/doc/cache +++ b/doc/cache @@ -1,14 +1,14 @@ -Cistron Password Caching +FreeRADIUS Password Caching Acknowledgements Thanks to Alan DeKok for the initial idea, to Dr. Bob Pilgrim for -implementation strategies, and to Miquel for putting it into cistron. +implementation strategies, and to Miquel for putting it into FreeRADIUS. What does this caching do? It will add the capability to cache several of the system files that -are used often by cistron radius. These include: /etc/passwd, /etc/shadow +are used often by FreeRADIUS. These include: /etc/passwd, /etc/shadow (if necessary), and /etc/group. By caching the information in these files and storing it in a VERY efficient @@ -117,8 +117,8 @@ authentication performance. NOTE: radutmp caching is disabled for now until we can find a better way to do it. Still, this next paragraph indicates why it needs doing. -Lastly, if you're using the wonderful simultaneous-use check item in cistron -radius, you have another disk lookup to perform on your /var/log/radutmp +Lastly, if you're using the wonderful simultaneous-use check item in +FreeRADIUS, you have another disk lookup to perform on your /var/log/radutmp file (actually, caching of this file just came available in b17. glad somebody else noticed it :) What happens is, if the user is authenticated properly, the daemon then opens the radutmp file, reads until it hits a line diff --git a/doc/cisco b/doc/cisco index 3727c9a..c06fa61 100644 --- a/doc/cisco +++ b/doc/cisco @@ -67,8 +67,7 @@ If you want the IP address of the user to show up in the radutmp file This is because with IOS 11.3, the Cisco first sends a "Start" accounting packet without the IP address included. By setting "update newinfo" it -will send an account "Alive" packet which updates the information. Cistron -Radius understands the "Alive" packet since 1.5.4.3-beta7. +will send an account "Alive" packet which updates the information. Also you might see a lot of "duplicates" in the logfile. That can be diff --git a/man/man8/builddbm.8 b/man/man8/builddbm.8 index 459219a..29ff1c1 100644 --- a/man/man8/builddbm.8 +++ b/man/man8/builddbm.8 @@ -1,4 +1,4 @@ -.TH BUILDDBM 8 "20 Januari 1997" "" "Cistron Radius Daemon" +.TH BUILDDBM 8 "20 Januari 1997" "" "FreeRADIUS Radius Daemon" .SH NAME builddbm -- build DBM file from RADIUS users file. .SH SYNOPSIS diff --git a/raddb/dictionary.usr b/raddb/dictionary.usr index 94bb3a9..8f36b4c 100644 --- a/raddb/dictionary.usr +++ b/raddb/dictionary.usr @@ -252,7 +252,7 @@ ATTRIB_NMC USR-AT-RTMP-Output-Filter 0x983b string ATTRIB_NMC USR-AT-Zip-Output-Filter 0x983c string ATTRIB_NMC USR-AT-Call-Output-Filter 0x983d string ATTRIB_NMC USR-ET-Bridge-Output-Filter 0x983e string -# This item name is too long for Cistron to parse; had to chop the r off. +# This item name is too long for the server to parse; had to chop the r off. FIXME? ATTRIB_NMC USR-ET-Bridge-Call-Output-Filte 0x983f string ATTRIB_NMC USR-IP-Default-Route-Option 0x9840 integer ATTRIB_NMC USR-MP-EDO-HIPER 0x9841 string diff --git a/raddb/naspasswd b/raddb/naspasswd index 3ff89d6..b681ce9 100644 --- a/raddb/naspasswd +++ b/raddb/naspasswd @@ -2,7 +2,7 @@ # naspasswd This is the file that primarily stores the passwords # for the NASes. This will be read by checkrad.pl to # supply the password for a certain NAS if needed, in the -# event that Cistron Radiusd suspects a multiple login. +# event that FreeRADIUS server suspects a multiple login. # # Note that at this time you ONLY need to enter passwords # here if you use a non-SNMP method to poll the terminal diff --git a/share/dictionary.usr b/share/dictionary.usr index 94bb3a9..8f36b4c 100644 --- a/share/dictionary.usr +++ b/share/dictionary.usr @@ -252,7 +252,7 @@ ATTRIB_NMC USR-AT-RTMP-Output-Filter 0x983b string ATTRIB_NMC USR-AT-Zip-Output-Filter 0x983c string ATTRIB_NMC USR-AT-Call-Output-Filter 0x983d string ATTRIB_NMC USR-ET-Bridge-Output-Filter 0x983e string -# This item name is too long for Cistron to parse; had to chop the r off. +# This item name is too long for the server to parse; had to chop the r off. FIXME? ATTRIB_NMC USR-ET-Bridge-Call-Output-Filte 0x983f string ATTRIB_NMC USR-IP-Default-Route-Option 0x9840 integer ATTRIB_NMC USR-MP-EDO-HIPER 0x9841 string diff --git a/src/Makefile b/src/Makefile index 5471562..20f3511 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# Makefile Makefile for the cistron-radius package. +# Makefile # # Version: $Id$ # diff --git a/src/include/radiusd.h b/src/include/radiusd.h index aee2585..56a16f8 100644 --- a/src/include/radiusd.h +++ b/src/include/radiusd.h @@ -2,7 +2,7 @@ #define RADIUSD_H /* * radiusd.h Structures, prototypes and global variables - * for the Cistron Radius server. + * for the FreeRADIUS server. * * Version: $Id$ * diff --git a/src/main/builddbm.c b/src/main/builddbm.c index 24e2bc2..60fc960 100644 --- a/src/main/builddbm.c +++ b/src/main/builddbm.c @@ -22,7 +22,7 @@ */ char sccsid[] = -"@(#)builddbm.c 2.2 Copyright 1999 Cistron Internet Services"; +"@(#)builddbm.c 2.2 Copyright 2001 FreeRADIUS Project"; #include "autoconf.h" diff --git a/src/main/checkrad.pl.in b/src/main/checkrad.pl.in index 48fdff3..541a457 100644 --- a/src/main/checkrad.pl.in +++ b/src/main/checkrad.pl.in @@ -2,7 +2,7 @@ # # checkrad.pl See if a user is (still) logged in on a certain port. # -# This is used by the cistron-radius server to check +# This is used by the FreeRADIUS server to check # if its idea of a user logged in on a certain port/nas # is correct if a double login is detected. # diff --git a/src/main/client.c b/src/main/client.c index 3803a26..df0eba5 100644 --- a/src/main/client.c +++ b/src/main/client.c @@ -248,10 +248,10 @@ const char *client_name(uint32_t ipaddr) } /* - * FIXME! - * * We should NEVER reach this piece of code, as we should * NEVER be looking up client names for clients we don't know! */ + radlog(L_ERR, "ERROR! Unreachable code reached, at %s:%d", __FILE__, __LINE__); + return "UNKNOWN-CLIENT"; } diff --git a/src/main/conffile.c b/src/main/conffile.c index c166689..4517728 100644 --- a/src/main/conffile.c +++ b/src/main/conffile.c @@ -752,12 +752,6 @@ static CONF_PARSER directory_config[] = { }; -/* JLN - * Read the configuration and library - * This uses the new kind of configuration file as defined by - * Miquel at http://www.miquels.cistron.nl/radius/ - */ - int read_radius_conf_file(void) { char buffer[256]; diff --git a/src/main/radtest.in b/src/main/radtest.in index eb2a2eb..375821d 100644 --- a/src/main/radtest.in +++ b/src/main/radtest.in @@ -1,7 +1,7 @@ #! /bin/sh # # radtest Emulate the user interface of the old -# radtest that used to be part of cistron-radius. +# radtest that used to be part of FreeRADIUS. # # Version: $Id$ # diff --git a/src/modules/Makefile b/src/modules/Makefile index d03a1dc..c59dc1b 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -1,5 +1,5 @@ # -# Makefile Makefile for the cistron-radius package. +# Makefile # # Version: $Id$ #