Merge branch 'master' of github.com:FreeRADIUS/freeradius-server

debian/control

@@ -3,7 +3,6 @@ Build-Depends: debhelper (>= 6.0.7),
  quilt,
  dpkg-dev (>= 1.13.19),
  autotools-dev,
- libtool,
  libltdl3-dev,
  libssl-dev,
  libpam0g-dev,
@@ -16,6 +15,7 @@ Build-Depends: debhelper (>= 6.0.7),
  libperl-dev,
  libpcap-dev,
  python-dev,
+ libreadline-dev,
  libsnmp-dev,
  libpq-dev,
  libssl-dev

debian/freeradius-mysql.install

@@ -1,3 +1 @@
 usr/lib/freeradius/rlm_sql_mysql*.so
-etc/freeradius/sql/mysql/*
-etc/freeradius/mods-available/sql*

debian/freeradius-mysql.postinst

@@ -4,20 +4,15 @@ set -e
 
 case "$1" in
   configure)
-        for file in /etc/freeradius/sql/mysql/counter.conf \
-          /etc/freeradius/sql/mysql/dialup.conf \
-          /etc/freeradius/sql/mysql/ippool.conf \
-          /etc/freeradius/sql/mysql/ippool.sql \
-          /etc/freeradius/sql/mysql/nas.sql \
-          /etc/freeradius/sql/mysql/schema.sql
+        for file in `find /etc/freeradius/sql/main/mysql/ -print`
         do
           if ! dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --add --update root freerad 0640 $file
           fi
         done
 
-        for dir in /etc/freeradius/sql \
-          /etc/freeradius/sql/mysql
+        for dir in /etc/freeradius/sql/main \
+          /etc/freeradius/sql/main/mysql
         do
           if ! dpkg-statoverride --list | grep -qw $dir$; then
             dpkg-statoverride --add --update root freerad 2751 $dir

debian/freeradius-mysql.prerm

@@ -4,12 +4,7 @@ set -e
 
 case "$1" in
   remove)
-        for file in /etc/freeradius/sql/mysql/counter.conf \
-          /etc/freeradius/sql/mysql/dialup.conf \
-          /etc/freeradius/sql/mysql/ippool.conf \
-          /etc/freeradius/sql/mysql/ippool.sql \
-          /etc/freeradius/sql/mysql/nas.sql \
-          /etc/freeradius/sql/mysql/schema.sql
+        for file in `find /etc/freeradius/sql/main/mysql/ -print`
         do
           if dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --remove $file

debian/freeradius-postgresql.install

@@ -1,2 +1 @@
 usr/lib/freeradius/rlm_sql_postgresql*.so
-etc/freeradius/sql/postgresql/*

debian/freeradius-postgresql.postinst

@@ -4,23 +4,15 @@ set -e
 
 case "$1" in
   configure)
-        for file in /etc/freeradius/sql/postgresql/cisco_h323_db_schema.sql \
-          /etc/freeradius/sql/postgresql/counter.conf \
-          /etc/freeradius/sql/postgresql/dialup.conf \
-          /etc/freeradius/sql/postgresql/ippool.conf \
-          /etc/freeradius/sql/postgresql/ippool.sql \
-          /etc/freeradius/sql/postgresql/nas.sql \
-          /etc/freeradius/sql/postgresql/schema.sql \
-          /etc/freeradius/sql/postgresql/update_radacct_group_trigger.sql \
-          /etc/freeradius/sql/postgresql/voip-postpaid.conf
+        for file in `find /etc/freeradius/sql/main/postgresql/ -print` 
         do
           if ! dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --add --update root freerad 0640 $file
           fi
         done
 
-        for dir in /etc/freeradius/sql \
-          /etc/freeradius/sql/postgresql
+        for dir in /etc/freeradius/sql/main \
+          /etc/freeradius/sql/main/postgresql
         do
           if ! dpkg-statoverride --list | grep -qw $dir$; then
             dpkg-statoverride --add --update root freerad 2751 $dir

debian/freeradius-postgresql.prerm

@@ -4,23 +4,15 @@ set -e
 
 case "$1" in
   remove)
-        for file in /etc/freeradius/sql/postgresql/cisco_h323_db_schema.sql \
-          /etc/freeradius/sql/postgresql/counter.conf \
-          /etc/freeradius/sql/postgresql/dialup.conf \
-          /etc/freeradius/sql/postgresql/ippool.conf \
-          /etc/freeradius/sql/postgresql/ippool.sql \
-          /etc/freeradius/sql/postgresql/nas.sql \
-          /etc/freeradius/sql/postgresql/schema.sql \
-          /etc/freeradius/sql/postgresql/update_radacct_group_trigger.sql \
-          /etc/freeradius/sql/postgresql/voip-postpaid.conf
+        for file in `find /etc/freeradius/sql/main/postgresql/ -print`
         do
           if dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --remove $file
           fi
         done
 
-        for dir in /etc/freeradius/sql \
-          /etc/freeradius/sql/postgresql
+        for dir in /etc/freeradius/sql/main \
+          /etc/freeradius/sql/main/postgresql
         do
           if dpkg-statoverride --list | grep -qw $dir$; then
             dpkg-statoverride --remove $dir

debian/freeradius.install

@@ -18,6 +18,7 @@ etc/freeradius/proxy.conf
 etc/freeradius/sites-available/*
 etc/freeradius/templates.conf
 etc/freeradius/users
+etc/freeradius/sql/*
 usr/lib/freeradius/rlm*.so
 usr/sbin/checkrad
 usr/sbin/freeradius

raddb/policy.d/filter

@@ -81,7 +81,7 @@ filter_username {
 	#  reject Multiple @'s
 	#  e.g. "user@site.com@site.com"
 	#
-	if(User-Name =~ /@(.+)?@/i ) {
+	if(User-Name =~ /@.*@/ ) {
 		update reply {
 			Reply-Message += "Rejected: Multiple @ in username"
 		}

src/include/tls-h

@@ -1,7 +1,7 @@
 #ifndef FR_TLS_H
 #define FR_TLS_H
 
-#if WITH_TLS
+#ifdef WITH_TLS
 
 /*
  * @file tls.h

src/modules/rlm_eap/types/rlm_eap_gtc/.gitignore

@@ -0,0 +1 @@
+all.mk

src/modules/rlm_eap/types/rlm_eap_gtc/all.mk.in

@@ -0,0 +1,12 @@
+TARGETNAME	:= @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET		:= $(TARGETNAME).a
+endif
+
+SOURCES		:= $(TARGETNAME).c
+
+SRC_CFLAGS	:= @eap_gtc_cflags@
+TGT_LDLIBS	:= @eap_gtc_ldflags@
+SRC_INCDIRS	:= ../../ ../../libeap/
+TGT_PREREQS	:= libfreeradius-eap.a