Change build options --- freeradius-1.0.5/debian/rules 2005-10-03 10:26:07.000000000 +0100 +++ freeradius-1.0.5/debian/rules 2005-10-03 10:23:00.000000000 +0100 @@ -57,24 +57,17 @@ --with-logdir=/var/log/$(package) \ --with-thread-pool --with-system-libtool \ --enable-ltdl-install=no --enable-strict-dependencies \ - --without-rlm_eap_peap \ - --without-rlm_eap_tls \ - --without-rlm_eap_ttls \ + --with-rlm_eap_peap \ + --with-rlm_eap_tls \ + --with-rlm_eap_ttls \ --without-rlm_sql_postgresql \ --without-snmp \ --with-udpfromto --with-edir \ --enable-developer -# To make SSL-enabled, remove this: -# --without-rlm_eap_peap \ - --without-rlm_eap_tls \ - --without-rlm_eap_ttls \ - --without-rlm_sql_postgresql \ - --without-snmp \ - # and add these: # --with-rlm_sql_postgresql_lib_dir=`pg_config --libdir` \ - --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \ +# --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \ # Modify Make.inc for Debian... TEMPFILE=`mktemp /tmp/radmake-XXXXXX`; \ --- freeradius-1.0.5/debian/control 2005-10-03 11:13:51.000000000 +0100 +++ freeradius-1.0.5/debian/control 2005-10-03 11:15:13.000000000 +0100 @@ -1,6 +1,5 @@ Source: freeradius Build-Depends: debhelper (>= 4.1.68), libltdl3-dev, libpam0g-dev, libmysqlclient12-dev, libgdbm-dev, libldap2-dev, libsasl2-dev, libiodbc2-dev, libkrb5-dev, libtool1.4 | libtool (< 1.5), autotools-dev, dpatch (>= 2) -Build-Conflicts: libssl-dev Section: net Priority: optional Maintainer: Paul Hampson --- freeradius-1.0.5/src/modules/rlm_sql/rlm_sql.c 2005-08-31 13:49:52.000000000 +0100 +++ freeradius-1.0.5/src/modules/rlm_sql/rlm_sql.c 2005-10-03 10:24:37.000000000 +0100 @@ -853,12 +853,12 @@ * Recompile, and run 'radiusd -X' */ - /* + DEBUG2("rlm_sql: check items"); vp_listdebug(check_tmp); DEBUG2("rlm_sql: reply items"); vp_listdebug(reply_tmp); - */ + if (paircmp(request, request->packet->vps, check_tmp, &reply_tmp) != 0) { radlog(L_INFO, "rlm_sql (%s): No matching entry in the database for request from user [%s]", --- freeradius-1.0.5/dialup_admin/htdocs/clear_opensessions.php3 2004-04-06 20:37:48.000000000 +0100 +++ freeradius-1.0.5/dialup_admin/htdocs/clear_opensessions.php3 2005-10-03 01:47:45.000000000 +0100 @@ -103,7 +103,7 @@ } ?>
- > + --- freeradius-1.0.5/dialup_admin/htdocs/group_admin.php3 2003-02-01 16:33:26.000000000 +0000 +++ freeradius-1.0.5/dialup_admin/htdocs/group_admin.php3 2005-10-03 01:49:28.000000000 +0100 @@ -88,9 +88,9 @@ - > - - + + +
--- freeradius-1.0.5/dialup_admin/htdocs/password.php3 2002-08-22 15:16:55.000000000 +0100 +++ freeradius-1.0.5/dialup_admin/htdocs/password.php3 2005-10-03 01:47:56.000000000 +0100 @@ -1,5 +1,5 @@ -> +
--- freeradius-1.0.5/dialup_admin/htdocs/user_delete.php3 2003-02-01 16:33:27.000000000 +0000 +++ freeradius-1.0.5/dialup_admin/htdocs/user_delete.php3 2005-10-03 01:49:54.000000000 +0100 @@ -80,7 +80,7 @@ } ?> - > +
--- freeradius-1.0.5/dialup_admin/htdocs/user_edit.php3 2003-10-20 17:39:39.000000000 +0100 +++ freeradius-1.0.5/dialup_admin/htdocs/user_edit.php3 2005-10-03 01:48:35.000000000 +0100 @@ -95,8 +95,8 @@ ?> - > - > + + --- freeradius-1.0.5/dialup_admin/htdocs/user_test.php3 2004-04-06 20:37:48.000000000 +0100 +++ freeradius-1.0.5/dialup_admin/htdocs/user_test.php3 2005-10-03 01:48:54.000000000 +0100 @@ -137,7 +137,7 @@ } ?> - > +
--- freeradius-1.0.5/dialup_admin/conf/naslist.conf 2003-11-02 13:57:36.000000000 +0000 +++ freeradius-1.0.5/dialup_admin/conf/naslist.conf 2005-10-03 02:05:56.000000000 +0100 @@ -1,27 +1,27 @@ # # This file contains the NAS list # -nas1_name: nas1.%{general_domain} -nas1_model: Cisco 2511 access server -nas1_ip: 147.122.122.121 -nas1_port_num: 16 -nas1_community: public -nas2_name: nas2.%{general_domain} -nas2_model: Cisco 2511 access server -nas2_ip: 147.122.122.123 -nas2_port_num: 16 -nas2_community: public +#nas1_name: nas1.%{general_domain} +#nas1_model: Cisco 2511 access server +#nas1_ip: 127.0.0.1 +#nas1_port_num: 16 +#nas1_community: public +#nas2_name: nas2.%{general_domain} +#nas2_model: Cisco 2511 access server +#nas2_ip: 127.0.0.1 +#nas2_port_num: 16 +#nas2_community: public # # finger type can also be set per NAS # snmp: Use snmp to query the NAS # database: Only query the sql database # # If it is not set, general_finger_type is assumed -nas2_finger_type: database +#nas2_finger_type: database # nas type can also be set per NAS -nas2_type: cisco -nas3_name: nas3.%{general_domain} -nas3_model: Cisco 5300 access server -nas3_ip: 147.122.122.124 -nas3_port_num: 210 -nas3_community: public +#nas2_type: cisco +#nas3_name: nas3.%{general_domain} +#nas3_model: Cisco 5300 access server +#nas3_ip: 127.0.0.1 +#nas3_port_num: 210 +#nas3_community: public --- freeradius-1.0.5/dialup_admin/conf/sql.attrmap 2002-11-23 16:20:17.000000000 +0000 +++ freeradius-1.0.5/dialup_admin/conf/sql.attrmap 2005-10-03 01:11:14.000000000 +0100 @@ -47,5 +47,5 @@ replyItem Port-Limit Port-Limit replyItem Login-LAT-Port Login-LAT-Port replyitem Reply-Message Reply-Message -replyItem Dialup-Lock-Msg Reply-Message +replyItem Dialup-Lock-Msg Dialup-Lock-Msg replyItem User-Password User-Password --- freeradius-1.0.5/dialup_admin/conf/admin.conf 2004-04-16 16:03:13.000000000 +0100 +++ freeradius-1.0.5/dialup_admin/conf/admin.conf 2005-10-03 11:06:03.000000000 +0100 @@ -24,7 +24,7 @@ # The base directory of the freeradius radius installation # general_radiusd_base_dir: /usr/local/radiusd -general_domain: company.com +general_domain: example.com # # Set it to yes to use sessions and cache the various mappings # You can also set use_session = 1 in config.php3 to also cache @@ -162,7 +162,7 @@ # used only when writing to the directory, not when reading # #ldap_write_server: master.%{general_domain} -ldap_base: dc=company,dc=com +ldap_base: dc=example,dc=com ldap_binddn: cn=Directory Manager ldap_bindpw: XXXXXXX ldap_default_new_entry_suffix: ou=dialup,ou=guests,%{ldap_base} @@ -199,7 +199,7 @@ # # One use of this would be to restrict access to only the user's belonging to # a specific administrator like this: -# ldap_filter: (&(uid=%u)(manager=uid=%U,ou=admins,o=company,c=com)) +# ldap_filter: (&(uid=%u)(manager=uid=%U,ou=admins,o=example,c=com)) # #ldap_filter: (uid=%u) # @@ -288,7 +288,7 @@ sql_connect_timeout: 3 # Give a space separated list of extra mysql servers to connect to when # logging bad logins or adding users in the badusers table -#sql_extra_servers: sql2.company.com sql3.company.com +#sql_extra_servers: sql2.example.com sql3.example.com # # Default values for the various user limits in case the counter module