From 7dcb91815b15a641c23d8ea9f4bbce58dec514f6 Mon Sep 17 00:00:00 2001 From: miquels Date: Sat, 21 Aug 1999 11:24:49 +0000 Subject: [PATCH] Hmm, how does this work? My changelog is in doc/ChangeLog --- INSTALL | 2 +- Make.inc.in | 1 + Makefile.in | 6 +++++- configure.in | 13 +++++++++++++ debian/rules | 4 ++-- doc/ChangeLog | 8 ++++++++ doc/PAM | 11 +++++------ doc/README | 30 +++++++++++++++--------------- doc/README.Y2K | 16 +++++++++------- doc/Simultaneous-Use | 4 ++-- doc/proxy | 4 ++-- src/modules/Makefile.in | 2 +- 12 files changed, 64 insertions(+), 37 deletions(-) diff --git a/INSTALL b/INSTALL index c63abe7..801bef1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ Please read the README in the doc/ subdirectory. Paragraph 2 tells -you how to configure, compile and install Cistron Radius. +you how to configure, compile and install freeradius. diff --git a/Make.inc.in b/Make.inc.in index 3b185c1..6759b24 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -17,6 +17,7 @@ logdir = @logdir@ raddbdir = @raddbdir@ radacctdir = @radacctdir@ +MAKE = @MAKE@ CC = @CC@ RANLIB = @RANLIB@ INCLUDE = diff --git a/Makefile.in b/Makefile.in index 09302a2..a7f7272 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,11 +1,15 @@ # # Makefile Makefile for the cistron-radius package. # -# Version: @(#)Makefile 1.00 01-Jul-1999 miquels@cistron.nl +# NOTE: This top-level Makefile must not +# use GNU-make extensions. The lower ones can. +# +# Version: @(#)Makefile 1.10 21-Aug-1999 miquels@cistron.nl # @INCLUDE@ @IQUOTE@Make.inc@IQUOTE@ +MAKE = @MAKE@ SUBDIRS = src raddb doc scripts WHAT_TO_MAKE = all diff --git a/configure.in b/configure.in index 0dc18e8..955d760 100644 --- a/configure.in +++ b/configure.in @@ -7,6 +7,18 @@ dnl Check for GNU cc AC_PROG_CC AC_PROG_RANLIB +dnl Find GNU Make. +AC_CHECK_PROG(GMAKE, gmake, yes, no) +if test $GMAKE = no; then + AC_PATH_PROG(MAKE, make, /usr/local/bin/make) +else + AC_PATH_PROG(MAKE, gmake, /usr/local/gnu/bin/make) +fi +makever=`$ac_cv_path_MAKE --version 2>&1 | grep "GNU Make"` +if test "$makever" = ""; then + AC_MSG_ERROR(GNU Make not installed -fatal) +fi + dnl Set Default CFLAGS if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE" @@ -269,6 +281,7 @@ AC_OUTPUT(\ ./Make.inc \ ./Makefile ./src/Makefile \ + ./src/include/build-radpaths-h \ ./src/lib/Makefile \ ./src/main/Makefile \ ./src/main/checkrad.pl \ diff --git a/debian/rules b/debian/rules index 4440f5f..93d610e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,11 +6,11 @@ SHELL=/bin/bash # Name. -package = radiusd-cistron +package = freeradius tmp = $(shell pwd)/debian/tmp define checkdir - test -f src/radiusd.c + test -f src/main/radiusd.c endef build: diff --git a/doc/ChangeLog b/doc/ChangeLog index eb6babf..eb67521 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +1999-08-21 Miquel van Smoorenburg (miquels@cistron.nl) + + * configure.in: check for GNU Make + * doc/*: change Cistron Radius to FreeRadius + * src/modules/Makefile.in: fix rm -f lib/* (bailed out on lib/CVS) + * debian/*: some changes (might want to rip out completely) + * doc/ChangeLog: new format, more like other projects. + radiusd-cistron (1.6-alpha3) experimental; urgency=low * Changed directory structure. Each module is now in it's own directory. diff --git a/doc/PAM b/doc/PAM index fead45f..d089abe 100644 --- a/doc/PAM +++ b/doc/PAM @@ -1,5 +1,5 @@ - PAM Support for Cistron-radiusd + PAM Support for FreeRadius 0. INTRODUCTION @@ -11,17 +11,16 @@ 1. USAGE - Use Auth-Type = Pam in the users file. For backwards compatibility, - you can also use Password = "PAM" but, like Password = "UNIX", this - is depreciated. + Use Auth-Type = Pam in the users file. You cannot use Password = "PAM" + as in other radius servers. Sorry. You can also use ``Pam-Auth = "somestring"'' to specify an entry in /etc/pam.d. The default is "radius". 2. NOTES - Added the following hacks, see CFLAGS in src/Makefile to activate. - Crude support for PAM authentication (-DPAM), User-Password = "PAM". + Use ./configure --iwth-pam to enable building of the PAM module + (for now) Miguel has made PAM changes to the Cistron radiusd, since he now uses it as the basis of many accounting systems. However, according to the diff --git a/doc/README b/doc/README index 07db66a..4a426e1 100644 --- a/doc/README +++ b/doc/README @@ -1,14 +1,14 @@ 0. WARNING! - Cistron Radius now uses autoconf - some of the default directories + ReeRadius 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 1.6-alphaX of the Cistron Radius daemon. + This is version 0.1 of the FreeRadius daemon. *** THIS IS AN ALPHA VERSION! IT MIGHT NOT WORK *** @@ -33,7 +33,7 @@ Work on real manual pages is progressing slowly. For a large part you can use the documentation of the Livingston 2.01 server. Just remember - that using Prefix and Suffix in both the "users" and the (cistron-radiusd + that using Prefix and Suffix in both the "users" and the (FreeRadius specific) "hints" file will give unpredictable results. Well actually it will result in Prefix and Suffix probably not working in the "users" file if you already stripped them off in the "hints" file. @@ -120,7 +120,7 @@ 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 - is. Currently Cistron Radius supports the following NAS types: + is. Currently FreeRadius supports the following NAS types: Terminal Server Type in naslist @@ -182,7 +182,7 @@ You can uses spaces in usernames by escaping them with \ or by using quotes. For example, "joe user" or joe\ user. - The Cistron Radiusd does not trim any spaces from a username received + 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). @@ -280,19 +280,19 @@ 6. MORE INFO, SUPPORT - I know that the documentation provided is sparse. However it is not in + 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 servers works and how the RADIUS protocol works and is used. - Unfortunately I do not have too much time myself to answer all questions - that might arise through email - you can always try sending me email, - ofcourse, but I cannot guarantee a reply, depends on how much time I have. + The latest version of FreeRadius is always available through + anonymous CVS from cvs.freeradius.org - for more info, see + http://www.freeradius.org/ - The latest version of Cistron Radius is always available from - http://www.www.cistron.nl/radius/ - - There is a majordomo mailing list hosted by Cistron Internet Services. Send - a message with "help" in the body to cistron-radius-request@info.cistron.nl. + 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 + body to freeradius-devel-request@info.cistron.nl. You can browse the archive of this mailing list at http://info.cistron.nl/archives/cistron-radius/ @@ -313,4 +313,4 @@ out how to subscribe. - README 1.6-alpha2 Miquel van Smoorenburg 11-Aug-1999 + README 0.1-alpha Miquel van Smoorenburg 21-Aug-1999 diff --git a/doc/README.Y2K b/doc/README.Y2K index 61fdd73..a32d3d4 100644 --- a/doc/README.Y2K +++ b/doc/README.Y2K @@ -1,17 +1,19 @@ - Cistron Radius and Y2K + FreeRadius and Y2K - I've checked the source code of radiusd-cistron-1.5.4.3-beta15 for - obvious Y2K problems (use of tm_year from struct tm for example) - and couldn't find any. + I've checked the source code of radiusd-cistron-1.5.4.3-beta15 on + which FreeRadius is based for obvious Y2K problems (use of tm_year + from struct tm for example) and couldn't find any. This doesn't mean you can sue me if there happens to be a Y2K problem - anyway. It does mean that I am pretty sure Cistron Radius will survive + anyway. It does mean that I am pretty sure FreeRadius will survive 31-12-1999 -> 01-01-2000 and that our ISP business will run uninterrupted. + Anyway, FreeRadius is still in Alpha stage. Perhaps the first 1.0 + version will be released after 1-1-2000 and we don't need to worry + about this Y2K problem anymore. - - README.Y2K Miquel van Smoorenburg 26-Mar-1999 + README.Y2K Miquel van Smoorenburg 21-Aug-1999 diff --git a/doc/Simultaneous-Use b/doc/Simultaneous-Use index c7047b2..c005c54 100644 --- a/doc/Simultaneous-Use +++ b/doc/Simultaneous-Use @@ -1,10 +1,10 @@ - Cistron-Radius and the Simultaneous-Use parameter. + FreeRadius and the Simultaneous-Use parameter. 0. INTRODUCTION - Lots of people want to limt the number of times one user account can + Lots of people want to limit the number of times one user account can login, usually to one. Thi is hard to do with the radius protocol; the nature of the accounting stuff is such that the idea the radius server has about the list of logged-in users might be different from the idea diff --git a/doc/proxy b/doc/proxy index 43a20dc..6a351ea 100644 --- a/doc/proxy +++ b/doc/proxy @@ -1,10 +1,10 @@ - Cistron-Radius as a proxy radius server. + FreeRadius as a proxy radius server. 0. INTRODUCTION - It is now possible to use Cistron Radius as a proxy radius server. This + It is possible to use FreeRadius as a proxy radius server. This means that it can consult a remote radius server to validate a user. This is handy for roaming setups, or for renting ports to someone else. diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 13b80fd..d7778b5 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -13,7 +13,7 @@ all: clean: @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common - @rm -f *~ lib/* + @rm -f *~ lib/[0-9a-z]* install: @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common -- 2.1.4