[packages] freeradius2: update to v2.1.7, rename patches to match those in freeradius v1.1.x, fix LDAP support, force use of system libtool & libltdl
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17959 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
b9e776e727
commit
409b9e26db
@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=freeradius2
|
||||
PKG_VERSION:=2.1.4
|
||||
PKG_VERSION:=2.1.7
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/
|
||||
PKG_MD5SUM:=ba1fd573222ed5c8bead1cce1383a7a9
|
||||
PKG_MD5SUM:=b8df6cf0c3df1dded205ad5f954feb78
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
|
||||
|
||||
@ -295,6 +295,8 @@ CONFIGURE_ARGS+= \
|
||||
--with-threads \
|
||||
--with-openssl-includes="$(STAGING_DIR)/usr/include" \
|
||||
--with-openssl-libraries="$(STAGING_DIR)/usr/lib" \
|
||||
--with-system-libtool \
|
||||
--with-system-libltdl \
|
||||
--enable-strict-dependencies \
|
||||
--with-raddbdir=/etc/freeradius2 \
|
||||
--with-radacctdir=/var/db/radacct \
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff -urN freeradius-server-2.1.1/src/modules/rlm_ldap/configure freeradius-server-2.1.1.new/src/modules/rlm_ldap/configure
|
||||
--- freeradius-server-2.1.1/src/modules/rlm_ldap/configure 2008-09-25 10:41:26.000000000 +0200
|
||||
+++ freeradius-server-2.1.1.new/src/modules/rlm_ldap/configure 2008-10-13 06:29:23.000000000 +0200
|
||||
@@ -3744,8 +3744,7 @@
|
||||
if test x"$fail" != x""; then
|
||||
if test x"${enable_strict_dependencies}" = x"yes"; then
|
||||
{ { echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
|
||||
-echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
|
||||
- { (exit 1); exit 1; }; }
|
||||
+echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;} }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
|
||||
echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
|
@ -1,6 +1,5 @@
|
||||
diff -Naur freeradius-server-2.1.4/raddb/attrs freeradius-server-2.1.4.new/raddb/attrs
|
||||
--- freeradius-server-2.1.4/raddb/attrs 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/attrs 2009-04-07 15:09:02.000000000 -0700
|
||||
--- a/raddb/attrs
|
||||
+++ b/raddb/attrs
|
||||
@@ -1,7 +1,4 @@
|
||||
#
|
||||
-# Configuration file for the rlm_attr_filter module.
|
||||
@ -9,9 +8,8 @@ diff -Naur freeradius-server-2.1.4/raddb/attrs freeradius-server-2.1.4.new/raddb
|
||||
# $Id$
|
||||
#
|
||||
# This file contains security and configuration information
|
||||
diff -Naur freeradius-server-2.1.4/raddb/attrs.access_reject freeradius-server-2.1.4.new/raddb/attrs.access_reject
|
||||
--- freeradius-server-2.1.4/raddb/attrs.access_reject 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/attrs.access_reject 2009-04-07 15:09:20.000000000 -0700
|
||||
--- a/raddb/attrs.access_reject
|
||||
+++ b/raddb/attrs.access_reject
|
||||
@@ -1,7 +1,4 @@
|
||||
#
|
||||
-# Configuration file for the rlm_attr_filter module.
|
||||
@ -20,9 +18,8 @@ diff -Naur freeradius-server-2.1.4/raddb/attrs.access_reject freeradius-server-2
|
||||
# $Id$
|
||||
#
|
||||
# This configuration file is used to remove almost all of the attributes
|
||||
diff -Naur freeradius-server-2.1.4/raddb/attrs.accounting_response freeradius-server-2.1.4.new/raddb/attrs.accounting_response
|
||||
--- freeradius-server-2.1.4/raddb/attrs.accounting_response 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/attrs.accounting_response 2009-04-07 15:09:32.000000000 -0700
|
||||
--- a/raddb/attrs.accounting_response
|
||||
+++ b/raddb/attrs.accounting_response
|
||||
@@ -1,7 +1,4 @@
|
||||
#
|
||||
-# Configuration file for the rlm_attr_filter module.
|
||||
@ -31,9 +28,8 @@ diff -Naur freeradius-server-2.1.4/raddb/attrs.accounting_response freeradius-se
|
||||
# $Id$
|
||||
#
|
||||
# This configuration file is used to remove almost all of the attributes
|
||||
diff -Naur freeradius-server-2.1.4/raddb/attrs.pre-proxy freeradius-server-2.1.4.new/raddb/attrs.pre-proxy
|
||||
--- freeradius-server-2.1.4/raddb/attrs.pre-proxy 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/attrs.pre-proxy 2009-04-07 15:09:44.000000000 -0700
|
||||
--- a/raddb/attrs.pre-proxy
|
||||
+++ b/raddb/attrs.pre-proxy
|
||||
@@ -1,7 +1,4 @@
|
||||
#
|
||||
-# Configuration file for the rlm_attr_filter module.
|
||||
@ -42,9 +38,8 @@ diff -Naur freeradius-server-2.1.4/raddb/attrs.pre-proxy freeradius-server-2.1.4
|
||||
# $Id$
|
||||
#
|
||||
# This file contains security and configuration information
|
||||
diff -Naur freeradius-server-2.1.4/raddb/dictionary.in freeradius-server-2.1.4.new/raddb/dictionary.in
|
||||
--- freeradius-server-2.1.4/raddb/dictionary.in 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/dictionary.in 2009-04-07 15:10:18.000000000 -0700
|
||||
--- a/raddb/dictionary.in
|
||||
+++ b/raddb/dictionary.in
|
||||
@@ -11,14 +11,12 @@
|
||||
#
|
||||
# The filename given here should be an absolute path.
|
||||
@ -61,9 +56,8 @@ diff -Naur freeradius-server-2.1.4/raddb/dictionary.in freeradius-server-2.1.4.n
|
||||
|
||||
#
|
||||
# If you want to add entries to the dictionary file,
|
||||
diff -Naur freeradius-server-2.1.4/raddb/eap.conf freeradius-server-2.1.4.new/raddb/eap.conf
|
||||
--- freeradius-server-2.1.4/raddb/eap.conf 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/eap.conf 2009-04-07 15:20:28.000000000 -0700
|
||||
--- a/raddb/eap.conf
|
||||
+++ b/raddb/eap.conf
|
||||
@@ -27,7 +27,7 @@
|
||||
# then that EAP type takes precedence over the
|
||||
# default type configured here.
|
||||
@ -322,30 +316,32 @@ diff -Naur freeradius-server-2.1.4/raddb/eap.conf freeradius-server-2.1.4.new/ra
|
||||
|
||||
# The reply attributes sent to the NAS are
|
||||
# usually based on the name of the user
|
||||
@@ -357,20 +328,8 @@
|
||||
@@ -357,7 +328,7 @@
|
||||
# the tunneled request.
|
||||
#
|
||||
# allowed values: {no, yes}
|
||||
- use_tunneled_reply = no
|
||||
-
|
||||
- #
|
||||
- # The inner tunneled request can be sent
|
||||
- # through a virtual server constructed
|
||||
- # specifically for this purpose.
|
||||
- #
|
||||
- # If this entry is commented out, the inner
|
||||
- # tunneled request will be sent through
|
||||
- # the virtual server that processed the
|
||||
- # outer requests.
|
||||
- #
|
||||
+# use_tunneled_reply = no
|
||||
|
||||
#
|
||||
# The inner tunneled request can be sent
|
||||
@@ -369,13 +340,13 @@
|
||||
# the virtual server that processed the
|
||||
# outer requests.
|
||||
#
|
||||
- virtual_server = "inner-tunnel"
|
||||
+# virtual_server = "inner-tunnel"
|
||||
|
||||
# This has the same meaning as the
|
||||
# same field in the "tls" module, above.
|
||||
# The default value here is "yes".
|
||||
# include_length = yes
|
||||
- }
|
||||
+# use_tunneled_reply = yes
|
||||
+# }
|
||||
|
||||
##################################################
|
||||
#
|
||||
@@ -433,26 +392,16 @@
|
||||
@@ -438,26 +409,16 @@
|
||||
|
||||
# the PEAP module also has these configuration
|
||||
# items, which are the same as for TTLS.
|
||||
@ -376,9 +372,8 @@ diff -Naur freeradius-server-2.1.4/raddb/eap.conf freeradius-server-2.1.4.new/ra
|
||||
}
|
||||
|
||||
#
|
||||
diff -Naur freeradius-server-2.1.4/raddb/ldap.attrmap freeradius-server-2.1.4.new/raddb/ldap.attrmap
|
||||
--- freeradius-server-2.1.4/raddb/ldap.attrmap 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/ldap.attrmap 2009-04-07 15:21:54.000000000 -0700
|
||||
--- a/raddb/ldap.attrmap
|
||||
+++ b/raddb/ldap.attrmap
|
||||
@@ -13,8 +13,7 @@
|
||||
# If not present, defaults to "==" for checkItems,
|
||||
# and "=" for replyItems.
|
||||
@ -389,9 +384,8 @@ diff -Naur freeradius-server-2.1.4/raddb/ldap.attrmap freeradius-server-2.1.4.ne
|
||||
# If an operator is present in the value of the
|
||||
# LDAP entry (i.e. ":=foo"), then it over-rides
|
||||
# both the default, and any operator given here.
|
||||
diff -Naur freeradius-server-2.1.4/raddb/modules/counter freeradius-server-2.1.4.new/raddb/modules/counter
|
||||
--- freeradius-server-2.1.4/raddb/modules/counter 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/modules/counter 2009-04-08 01:34:16.000000000 -0700
|
||||
--- a/raddb/modules/counter
|
||||
+++ b/raddb/modules/counter
|
||||
@@ -69,7 +69,7 @@
|
||||
# 'check-name' attribute.
|
||||
#
|
||||
@ -401,10 +395,9 @@ diff -Naur freeradius-server-2.1.4/raddb/modules/counter freeradius-server-2.1.4
|
||||
key = User-Name
|
||||
count-attribute = Acct-Session-Time
|
||||
reset = daily
|
||||
diff -Naur freeradius-server-2.1.4/raddb/modules/detail freeradius-server-2.1.4.new/raddb/modules/detail
|
||||
--- freeradius-server-2.1.4/raddb/modules/detail 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/modules/detail 2009-04-07 15:28:33.000000000 -0700
|
||||
@@ -46,8 +46,7 @@
|
||||
--- a/raddb/modules/detail
|
||||
+++ b/raddb/modules/detail
|
||||
@@ -46,8 +46,7 @@ detail {
|
||||
|
||||
#
|
||||
# Every entry in the detail file has a header which
|
||||
@ -414,9 +407,8 @@ diff -Naur freeradius-server-2.1.4/raddb/modules/detail freeradius-server-2.1.4.
|
||||
#
|
||||
# The header can be customized by editing this
|
||||
# string. See "doc/variables.txt" for a description
|
||||
diff -Naur freeradius-server-2.1.4/raddb/modules/exec freeradius-server-2.1.4.new/raddb/modules/exec
|
||||
--- freeradius-server-2.1.4/raddb/modules/exec 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/modules/exec 2009-04-07 15:29:45.000000000 -0700
|
||||
--- a/raddb/modules/exec
|
||||
+++ b/raddb/modules/exec
|
||||
@@ -15,9 +15,8 @@
|
||||
# of the program which is executed. Due to RADIUS protocol
|
||||
# limitations, any output over 253 bytes will be ignored.
|
||||
@ -429,9 +421,8 @@ diff -Naur freeradius-server-2.1.4/raddb/modules/exec freeradius-server-2.1.4.ne
|
||||
#
|
||||
# See also "echo" for more sample configuration.
|
||||
#
|
||||
diff -Naur freeradius-server-2.1.4/raddb/modules/pap freeradius-server-2.1.4.new/raddb/modules/pap
|
||||
--- freeradius-server-2.1.4/raddb/modules/pap 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/modules/pap 2009-04-07 15:31:17.000000000 -0700
|
||||
--- a/raddb/modules/pap
|
||||
+++ b/raddb/modules/pap
|
||||
@@ -4,8 +4,7 @@
|
||||
|
||||
# PAP module to authenticate users based on their stored password
|
||||
@ -449,10 +440,9 @@ diff -Naur freeradius-server-2.1.4/raddb/modules/pap freeradius-server-2.1.4.new
|
||||
- auto_header = no
|
||||
+ auto_header = yes
|
||||
}
|
||||
diff -Naur freeradius-server-2.1.4/raddb/modules/radutmp freeradius-server-2.1.4.new/raddb/modules/radutmp
|
||||
--- freeradius-server-2.1.4/raddb/modules/radutmp 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/modules/radutmp 2009-04-07 11:13:56.000000000 -0700
|
||||
@@ -12,7 +12,7 @@
|
||||
--- a/raddb/modules/radutmp
|
||||
+++ b/raddb/modules/radutmp
|
||||
@@ -12,7 +12,7 @@ radutmp {
|
||||
# Where the file is stored. It's not a log file,
|
||||
# so it doesn't need rotating.
|
||||
#
|
||||
@ -461,9 +451,8 @@ diff -Naur freeradius-server-2.1.4/raddb/modules/radutmp freeradius-server-2.1.4
|
||||
|
||||
# The field in the packet to key on for the
|
||||
# 'user' name, If you have other fields which you want
|
||||
diff -Naur freeradius-server-2.1.4/raddb/modules/sradutmp freeradius-server-2.1.4.new/raddb/modules/sradutmp
|
||||
--- freeradius-server-2.1.4/raddb/modules/sradutmp 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/modules/sradutmp 2009-04-07 11:14:07.000000000 -0700
|
||||
--- a/raddb/modules/sradutmp
|
||||
+++ b/raddb/modules/sradutmp
|
||||
@@ -10,7 +10,7 @@
|
||||
# then name "sradutmp" to identify it later in the "accounting"
|
||||
# section.
|
||||
@ -473,9 +462,8 @@ diff -Naur freeradius-server-2.1.4/raddb/modules/sradutmp freeradius-server-2.1.
|
||||
perm = 0644
|
||||
callerid = "no"
|
||||
}
|
||||
diff -Naur freeradius-server-2.1.4/raddb/preproxy_users freeradius-server-2.1.4.new/raddb/preproxy_users
|
||||
--- freeradius-server-2.1.4/raddb/preproxy_users 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/preproxy_users 2009-04-07 15:23:02.000000000 -0700
|
||||
--- a/raddb/preproxy_users
|
||||
+++ b/raddb/preproxy_users
|
||||
@@ -1,6 +1,5 @@
|
||||
#
|
||||
# Configuration file for the rlm_files module.
|
||||
@ -483,10 +471,9 @@ diff -Naur freeradius-server-2.1.4/raddb/preproxy_users freeradius-server-2.1.4.
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
diff -Naur freeradius-server-2.1.4/raddb/proxy.conf freeradius-server-2.1.4.new/raddb/proxy.conf
|
||||
--- freeradius-server-2.1.4/raddb/proxy.conf 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/proxy.conf 2009-04-07 15:22:45.000000000 -0700
|
||||
@@ -525,9 +525,8 @@
|
||||
--- a/raddb/proxy.conf
|
||||
+++ b/raddb/proxy.conf
|
||||
@@ -559,9 +559,8 @@ home_server_pool my_auth_failover {
|
||||
# This section defines a new-style "realm". Note the in version 2.0,
|
||||
# there are many fewer configuration items than in 1.x for a realm.
|
||||
#
|
||||
@ -498,9 +485,8 @@ diff -Naur freeradius-server-2.1.4/raddb/proxy.conf freeradius-server-2.1.4.new/
|
||||
|
||||
#
|
||||
#
|
||||
diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4.new/raddb/radiusd.conf.in
|
||||
--- freeradius-server-2.1.4/raddb/radiusd.conf.in 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/radiusd.conf.in 2009-04-07 15:34:38.000000000 -0700
|
||||
--- a/raddb/radiusd.conf.in
|
||||
+++ b/raddb/radiusd.conf.in
|
||||
@@ -8,11 +8,6 @@
|
||||
|
||||
######################################################################
|
||||
@ -528,7 +514,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
#
|
||||
|
||||
prefix = @prefix@
|
||||
@@ -66,7 +55,7 @@
|
||||
@@ -66,7 +55,7 @@ name = radiusd
|
||||
|
||||
# Location of config and logfiles.
|
||||
confdir = ${raddbdir}
|
||||
@ -537,7 +523,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
# Should likely be ${localstatedir}/lib/radiusd
|
||||
db_dir = ${raddbdir}
|
||||
@@ -112,7 +101,7 @@
|
||||
@@ -112,7 +101,7 @@ libdir = @libdir@
|
||||
#
|
||||
# This file is written when ONLY running in daemon mode.
|
||||
#
|
||||
@ -546,7 +532,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
#
|
||||
pidfile = ${run_dir}/${name}.pid
|
||||
|
||||
@@ -283,7 +272,7 @@
|
||||
@@ -290,7 +279,7 @@ listen {
|
||||
# If your system does not support this feature, you will
|
||||
# get an error if you try to use it.
|
||||
#
|
||||
@ -555,7 +541,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
# Per-socket lists of clients. This is a very useful feature.
|
||||
#
|
||||
@@ -310,7 +299,7 @@
|
||||
@@ -317,7 +306,7 @@ listen {
|
||||
# ipv6addr = ::
|
||||
port = 0
|
||||
type = acct
|
||||
@ -564,8 +550,8 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
# clients = per_socket_clients
|
||||
}
|
||||
|
||||
@@ -445,9 +434,6 @@
|
||||
auth_goodpass = no
|
||||
@@ -464,9 +453,6 @@ log {
|
||||
# msg_badpass = ""
|
||||
}
|
||||
|
||||
-# The program to execute to do concurrency checks.
|
||||
@ -574,7 +560,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
# SECURITY CONFIGURATION
|
||||
#
|
||||
# There may be multiple methods of attacking on the server. This
|
||||
@@ -522,8 +508,8 @@
|
||||
@@ -541,8 +527,8 @@ security {
|
||||
#
|
||||
# allowed values: {no, yes}
|
||||
#
|
||||
@ -585,7 +571,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
|
||||
# CLIENTS CONFIGURATION
|
||||
@@ -675,10 +661,6 @@
|
||||
@@ -694,10 +680,6 @@ modules {
|
||||
#
|
||||
# $INCLUDE sql/mysql/counter.conf
|
||||
|
||||
@ -596,7 +582,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
}
|
||||
|
||||
# Instantiation
|
||||
@@ -703,7 +685,7 @@
|
||||
@@ -722,7 +704,7 @@ instantiate {
|
||||
# The entire command line (and output) must fit into 253 bytes.
|
||||
#
|
||||
# e.g. Framed-Pool = `%{exec:/bin/echo foo}`
|
||||
@ -605,7 +591,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
#
|
||||
# The expression module doesn't do authorization,
|
||||
@@ -716,15 +698,15 @@
|
||||
@@ -735,15 +717,15 @@ instantiate {
|
||||
# listed in any other section. See 'doc/rlm_expr' for
|
||||
# more information.
|
||||
#
|
||||
@ -624,7 +610,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
# subsections here can be thought of as "virtual" modules.
|
||||
#
|
||||
@@ -748,7 +730,7 @@
|
||||
@@ -767,7 +749,7 @@ instantiate {
|
||||
# to multiple times.
|
||||
#
|
||||
######################################################################
|
||||
@ -633,7 +619,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
######################################################################
|
||||
#
|
||||
@@ -758,9 +740,9 @@
|
||||
@@ -777,9 +759,9 @@ $INCLUDE policy.conf
|
||||
# match the regular expression: /[a-zA-Z0-9_.]+/
|
||||
#
|
||||
# It allows you to define new virtual servers simply by placing
|
||||
@ -645,7 +631,7 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
|
||||
######################################################################
|
||||
#
|
||||
@@ -768,15 +750,11 @@
|
||||
@@ -787,15 +769,11 @@ $INCLUDE sites-enabled/
|
||||
# "authenticate {}", "accounting {}", have been moved to the
|
||||
# the file:
|
||||
#
|
||||
@ -662,9 +648,8 @@ diff -Naur freeradius-server-2.1.4/raddb/radiusd.conf.in freeradius-server-2.1.4
|
||||
-# raddb/sites-available/README
|
||||
-#
|
||||
######################################################################
|
||||
diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-server-2.1.4.new/raddb/sites-available/default
|
||||
--- freeradius-server-2.1.4/raddb/sites-available/default 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/sites-available/default 2009-04-07 15:27:12.000000000 -0700
|
||||
--- a/raddb/sites-available/default
|
||||
+++ b/raddb/sites-available/default
|
||||
@@ -11,12 +11,6 @@
|
||||
#
|
||||
######################################################################
|
||||
@ -678,16 +663,16 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
# This configuration is designed to work in the widest possible
|
||||
# set of circumstances, with the widest possible number of
|
||||
# authentication methods. This means that in general, you should
|
||||
@@ -69,7 +63,7 @@
|
||||
# 'raddb/huntgroups' files.
|
||||
@@ -67,7 +61,7 @@ authorize {
|
||||
#
|
||||
# It also adds the %{Client-IP-Address} attribute to the request.
|
||||
# It takes care of processing the 'raddb/hints' and the
|
||||
# 'raddb/huntgroups' files.
|
||||
- preprocess
|
||||
+# preprocess
|
||||
|
||||
#
|
||||
# If you want to have a log of authentication requests,
|
||||
@@ -80,7 +74,7 @@
|
||||
@@ -78,7 +72,7 @@ authorize {
|
||||
#
|
||||
# The chap module will set 'Auth-Type := CHAP' if we are
|
||||
# handling a CHAP request and Auth-Type has not already been set
|
||||
@ -696,7 +681,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
|
||||
#
|
||||
# If the users are logging in with an MS-CHAP-Challenge
|
||||
@@ -88,13 +82,7 @@
|
||||
@@ -86,13 +80,7 @@ authorize {
|
||||
# the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP'
|
||||
# to the request, which will cause the server to then use
|
||||
# the mschap module for authentication.
|
||||
@ -710,8 +695,8 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
+# mschap
|
||||
|
||||
#
|
||||
# Look for IPASS style 'realm/', and if not found, look for
|
||||
@@ -108,7 +96,7 @@
|
||||
# The WiMAX specification says that the Calling-Station-Id
|
||||
@@ -115,7 +103,7 @@ authorize {
|
||||
# Otherwise, when the first style of realm doesn't match,
|
||||
# the other styles won't be checked.
|
||||
#
|
||||
@ -720,7 +705,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
# ntdomain
|
||||
|
||||
#
|
||||
@@ -133,14 +121,6 @@
|
||||
@@ -140,14 +128,6 @@ authorize {
|
||||
}
|
||||
|
||||
#
|
||||
@ -735,7 +720,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
# Read the 'users' file
|
||||
files
|
||||
|
||||
@@ -152,28 +132,11 @@
|
||||
@@ -159,28 +139,11 @@ authorize {
|
||||
# sql
|
||||
|
||||
#
|
||||
@ -764,7 +749,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
# If no other module has claimed responsibility for
|
||||
# authentication, then try to use PAP. This allows the
|
||||
# other modules listed above to add a "known good" password
|
||||
@@ -248,24 +211,6 @@
|
||||
@@ -255,24 +218,6 @@ authenticate {
|
||||
mschap
|
||||
}
|
||||
|
||||
@ -789,30 +774,24 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
# Uncomment it if you want to use ldap for authentication
|
||||
#
|
||||
# Note that this means "check plain-text password against
|
||||
@@ -278,19 +223,15 @@
|
||||
#
|
||||
# Allow EAP authentication.
|
||||
eap
|
||||
+ pap
|
||||
}
|
||||
|
||||
|
||||
@@ -307,13 +252,13 @@ authenticate {
|
||||
#
|
||||
# Pre-accounting. Decide which accounting type to use.
|
||||
#
|
||||
-preacct {
|
||||
- preprocess
|
||||
-
|
||||
- #
|
||||
- # Ensure that we have a semi-unique identifier for every
|
||||
- # request, and many NAS boxes are broken.
|
||||
- acct_unique
|
||||
+#preacct {
|
||||
+# preprocess
|
||||
|
||||
#
|
||||
# Ensure that we have a semi-unique identifier for every
|
||||
# request, and many NAS boxes are broken.
|
||||
- acct_unique
|
||||
+# acct_unique
|
||||
|
||||
#
|
||||
# Look for IPASS-style 'realm/', and if not found, look for
|
||||
@@ -300,13 +241,13 @@
|
||||
@@ -323,13 +268,13 @@ preacct {
|
||||
# Accounting requests are generally proxied to the same
|
||||
# home server as authentication requests.
|
||||
# IPASS
|
||||
@ -829,7 +808,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
|
||||
#
|
||||
# Accounting. Log the accounting data.
|
||||
@@ -316,14 +257,9 @@
|
||||
@@ -339,14 +284,9 @@ accounting {
|
||||
# Create a 'detail'ed log of the packets.
|
||||
# Note that accounting requests which are proxied
|
||||
# are also logged in the detail file.
|
||||
@ -845,7 +824,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
#
|
||||
# For Simultaneous-Use tracking.
|
||||
#
|
||||
@@ -332,9 +268,6 @@
|
||||
@@ -355,9 +295,6 @@ accounting {
|
||||
radutmp
|
||||
# sradutmp
|
||||
|
||||
@ -855,7 +834,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
#
|
||||
# Log traffic to an SQL database.
|
||||
#
|
||||
@@ -351,7 +284,7 @@
|
||||
@@ -374,7 +311,7 @@ accounting {
|
||||
# pgsql-voip
|
||||
|
||||
# Filter attributes from the accounting response.
|
||||
@ -864,7 +843,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
|
||||
#
|
||||
# See "Autz-Type Status-Server" for how this works.
|
||||
@@ -377,10 +310,7 @@
|
||||
@@ -400,10 +337,7 @@ session {
|
||||
# Post-Authentication
|
||||
# Once we KNOW that the user has been authenticated, there are
|
||||
# additional steps we can take.
|
||||
@ -876,7 +855,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
#
|
||||
# If you want to have a log of authentication replies,
|
||||
# un-comment the following line, and the 'detail reply_log'
|
||||
@@ -406,7 +336,7 @@
|
||||
@@ -429,7 +363,7 @@ post-auth {
|
||||
#
|
||||
# ldap
|
||||
|
||||
@ -884,8 +863,8 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
+# exec
|
||||
|
||||
#
|
||||
# Access-Reject packets are sent through the REJECT sub-section of the
|
||||
@@ -415,10 +345,10 @@
|
||||
# Calculate the various WiMAX keys. In order for this to work,
|
||||
@@ -473,10 +407,10 @@ post-auth {
|
||||
# Add the ldap module name (or instance) if you have set
|
||||
# 'edir_account_policy_check = yes' in the ldap module configuration
|
||||
#
|
||||
@ -900,7 +879,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
|
||||
#
|
||||
# When the server decides to proxy a request to a home server,
|
||||
@@ -428,7 +358,7 @@
|
||||
@@ -486,7 +420,7 @@ post-auth {
|
||||
#
|
||||
# Only a few modules currently have this method.
|
||||
#
|
||||
@ -909,7 +888,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
# attr_rewrite
|
||||
|
||||
# Uncomment the following line if you want to change attributes
|
||||
@@ -444,14 +374,14 @@
|
||||
@@ -502,14 +436,14 @@ pre-proxy {
|
||||
# server, un-comment the following line, and the
|
||||
# 'detail pre_proxy_log' section, above.
|
||||
# pre_proxy_log
|
||||
@ -926,7 +905,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
|
||||
# If you want to have a log of replies from a home server,
|
||||
# un-comment the following line, and the 'detail post_proxy_log'
|
||||
@@ -475,7 +405,7 @@
|
||||
@@ -533,7 +467,7 @@ post-proxy {
|
||||
# hidden inside of the EAP packet, and the end server will
|
||||
# reject the EAP request.
|
||||
#
|
||||
@ -935,7 +914,7 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
|
||||
#
|
||||
# If the server tries to proxy a request and fails, then the
|
||||
@@ -497,6 +427,5 @@
|
||||
@@ -555,6 +489,5 @@ post-proxy {
|
||||
# Post-Proxy-Type Fail {
|
||||
# detail
|
||||
# }
|
||||
@ -943,9 +922,8 @@ diff -Naur freeradius-server-2.1.4/raddb/sites-available/default freeradius-serv
|
||||
-}
|
||||
+#}
|
||||
|
||||
diff -Naur freeradius-server-2.1.4/raddb/users freeradius-server-2.1.4.new/raddb/users
|
||||
--- freeradius-server-2.1.4/raddb/users 2009-03-10 19:26:50.000000000 -0700
|
||||
+++ freeradius-server-2.1.4.new/raddb/users 2009-04-07 15:23:54.000000000 -0700
|
||||
--- a/raddb/users
|
||||
+++ b/raddb/users
|
||||
@@ -1,6 +1,5 @@
|
||||
#
|
||||
-# Please read the documentation file ../doc/processing_users_file,
|
4253
net/freeradius2/patches/004-ldap_configure.patch
Normal file
4253
net/freeradius2/patches/004-ldap_configure.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user