- Freeradius-Devel - lists.freeradius.org

Automatic report from sources (radiusd) between 12.06.2007 - 13.06.2007 GMT
by Automatic cvs log generator 13 Jun '07

13 Jun '07

CVS log entries from 12.06.2007 (Tue) 08:00:00 - 13.06.2007 (Wed) 08:00:01 GMT ===================================================== Summary by authors ===================================================== Author: aland File: radiusd/src/main/xlat.c; Revisions: 1.125, 1.124 File: radiusd/src/lib/vqp.c; Revisions: 1.2 File: radiusd/configure.in; Revisions: 1.244 File: radiusd/src/main/radiusd.c; Revisions: 1.370 File: radiusd/src/main/modcall.c; Revisions: 1.72, 1.71, 1.70, 1.22.2.1.2.4 File: radiusd/src/main/util.c; Revisions: 1.37.2.1.2.2 File: radiusd/src/main/listen.c; Revisions: 1.79 File: radiusd/src/include/radiusd.h; Revisions: 1.156.2.4.2.2 File: radiusd/man/man5/vmpsd.conf.5; Revisions: 1.3, 1.2 File: radiusd/doc/variables.txt; Revisions: 1.19 File: radiusd/man/man5/radiusd.conf.5; Revisions: 1.7 File: radiusd/src/main/request_list.c; Revisions: 1.40.2.2.2.7 File: radiusd/src/main/vmps.c; Revisions: 1.2 File: radiusd/configure; Revisions: 1.131 File: radiusd/src/main/evaluate.c; Revisions: 1.12 File: radiusd/man/man5/unlang.5; Revisions: 1.1 File: radiusd/src/include/autoconf.h.in; Revisions: 1.70 ===================================================== Combined list of identical log entries ===================================================== Description: Use 'control' rather than 'config', due to issues with xlat. Modified files: File: radiusd/src/main/evaluate.c; Revision: 1.12; Date: 2007/06/12 15:53:54; Author: aland; Lines: (+5 -2) File: radiusd/src/main/modcall.c; Revision: 1.72; Date: 2007/06/12 15:53:53; Author: aland; Lines: (+3 -3) ------------------------------- Description: Added --with-vmps to configure options, so that you can build without VMPS support. It's enabled by default... Modified files: File: radiusd/configure; Revision: 1.131; Date: 2007/06/12 09:16:24; Author: aland; Lines: (+143 -28) File: radiusd/configure.in; Revision: 1.244; Date: 2007/06/12 09:16:26; Author: aland; Lines: (+17 -1) File: radiusd/src/include/autoconf.h.in; Revision: 1.70; Date: 2007/06/12 09:16:26; Author: aland; Lines: (+7 -0) File: radiusd/src/lib/vqp.c; Revision: 1.2; Date: 2007/06/12 09:16:26; Author: aland; Lines: (+11 -2) File: radiusd/src/main/listen.c; Revision: 1.79; Date: 2007/06/12 09:16:27; Author: aland; Lines: (+18 -6) File: radiusd/src/main/radiusd.c; Revision: 1.370; Date: 2007/06/12 09:16:26; Author: aland; Lines: (+4 -2) File: radiusd/src/main/vmps.c; Revision: 1.2; Date: 2007/06/12 09:16:27; Author: aland; Lines: (+4 -2) ------------------------------- Description: Include component and module name in REQUEST, and in complaints about unresponsive children Modified files: File: radiusd/src/include/radiusd.h; Revision: 1.156.2.4.2.2; Date: 2007/06/12 09:31:45; Author: aland; Lines: (+3 -1) File: radiusd/src/main/modcall.c; Revision: 1.22.2.1.2.4; Date: 2007/06/12 09:31:45; Author: aland; Lines: (+4 -1) File: radiusd/src/main/request_list.c; Revision: 1.40.2.2.2.7; Date: 2007/06/12 09:31:46; Author: aland; Lines: (+5 -4) File: radiusd/src/main/util.c; Revision: 1.37.2.1.2.2; Date: 2007/06/12 09:31:46; Author: aland; Lines: (+4 -2) ===================================================== Log entries ===================================================== Description: Renamed "check" to "control" Modified files: File: radiusd/doc/variables.txt; Revision: 1.19; Date: 2007/06/12 16:06:11; Author: aland; Lines: (+3 -3) ------------------------------- Description: Clarify the configuration file syntax enormously Modified files: File: radiusd/man/man5/radiusd.conf.5; Revision: 1.7; Date: 2007/06/12 13:16:48; Author: aland; Lines: (+108 -52) ------------------------------- Description: Added a "man" page for the configuration file un-language. It's not done, but it's loads better than what was there before. Modified files: File: radiusd/man/man5/unlang.5; Revision: 1.1; Date: 2007/06/12 16:20:55; Author: aland; ------------------------------- Description: Note vmps == post-auth Modified files: File: radiusd/man/man5/vmpsd.conf.5; Revision: 1.3; Date: 2007/06/12 14:01:36; Author: aland; Lines: (+4 -0) ------------------------------- Description: Copy updated conf file text from radiusd.conf Modified files: File: radiusd/man/man5/vmpsd.conf.5; Revision: 1.2; Date: 2007/06/12 13:54:41; Author: aland; Lines: (+120 -55) ------------------------------- Description: Added support for xlat in switch statements Modified files: File: radiusd/src/main/modcall.c; Revision: 1.71; Date: 2007/06/12 12:22:31; Author: aland; Lines: (+8 -3) ------------------------------- Description: Added sections "switch foo" and "case bar". Right now, there's no xlat on either one (there probably should be on BOTH) There's also no "default" for the "switch". "case" can appear outside of a "switch", where it's treated as a "group"... sort of. Modified files: File: radiusd/src/main/modcall.c; Revision: 1.70; Date: 2007/06/12 12:06:26; Author: aland; Lines: (+138 -30) ------------------------------- Description: control attribute list Modified files: File: radiusd/src/main/xlat.c; Revision: 1.125; Date: 2007/06/12 15:55:11; Author: aland; Lines: (+10 -2) ------------------------------- Description: Clean up xlat messages Modified files: File: radiusd/src/main/xlat.c; Revision: 1.124; Date: 2007/06/12 12:25:18; Author: aland; Lines: (+4 -4) ===================================================== Summary of modified files ===================================================== File: radiusd/configure Revisions: 1.131 Authors: aland (+143 -28) ------------------------------- File: radiusd/configure.in Revisions: 1.244 Authors: aland (+17 -1) ------------------------------- File: radiusd/doc/variables.txt Revisions: 1.19 Authors: aland (+3 -3) ------------------------------- File: radiusd/man/man5/radiusd.conf.5 Revisions: 1.7 Authors: aland (+108 -52) ------------------------------- File: radiusd/man/man5/unlang.5 Revisions: 1.1 Authors: aland ------------------------------- File: radiusd/man/man5/vmpsd.conf.5 Revisions: 1.3, 1.2 Authors: aland (+4 -0), aland (+120 -55) ------------------------------- File: radiusd/src/include/autoconf.h.in Revisions: 1.70 Authors: aland (+7 -0) ------------------------------- File: radiusd/src/include/radiusd.h Revisions: 1.156.2.4.2.2 Authors: aland (+3 -1) ------------------------------- File: radiusd/src/lib/vqp.c Revisions: 1.2 Authors: aland (+11 -2) ------------------------------- File: radiusd/src/main/evaluate.c Revisions: 1.12 Authors: aland (+5 -2) ------------------------------- File: radiusd/src/main/listen.c Revisions: 1.79 Authors: aland (+18 -6) ------------------------------- File: radiusd/src/main/modcall.c Revisions: 1.72, 1.71, 1.70, 1.22.2.1.2.4 Authors: aland (+3 -3), aland (+8 -3), aland (+138 -30), aland (+4 -1) ------------------------------- File: radiusd/src/main/radiusd.c Revisions: 1.370 Authors: aland (+4 -2) ------------------------------- File: radiusd/src/main/request_list.c Revisions: 1.40.2.2.2.7 Authors: aland (+5 -4) ------------------------------- File: radiusd/src/main/util.c Revisions: 1.37.2.1.2.2 Authors: aland (+4 -2) ------------------------------- File: radiusd/src/main/vmps.c Revisions: 1.2 Authors: aland (+4 -2) ------------------------------- File: radiusd/src/main/xlat.c Revisions: 1.125, 1.124 Authors: aland (+10 -2), aland (+4 -4) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl

1 0

Automatic report from sources (radiusd) between 11.06.2007 - 12.06.2007 GMT
by Automatic cvs log generator 12 Jun '07

12 Jun '07

CVS log entries from 11.06.2007 (Mon) 08:00:01 - 12.06.2007 (Tue) 08:00:00 GMT ===================================================== Summary by authors ===================================================== Author: aland File: radiusd/src/main/xlat.c; Revisions: 1.123 File: radiusd/share/dictionary.quiconnect; Revisions: 1.2, 1.1 File: radiusd/src/main/modcall.c; Revisions: 1.69, 1.68 File: radiusd/share/dictionary; Revisions: 1.141 File: radiusd/src/main/evaluate.c; Revisions: 1.11, 1.10, 1.9 ===================================================== Combined list of identical log entries ===================================================== Description: Added Quiconnect dictionary Modified files: File: radiusd/share/dictionary; Revision: 1.141; Date: 2007/06/11 14:50:31; Author: aland; Lines: (+2 -1) File: radiusd/share/dictionary.quiconnect; Revision: 1.1; Date: 2007/06/11 14:50:31; Author: aland; ===================================================== Log entries ===================================================== Description: Renamed attributes Modified files: File: radiusd/share/dictionary.quiconnect; Revision: 1.2; Date: 2007/06/11 15:50:34; Author: aland; Lines: (+3 -3) ------------------------------- Description: Added support for (... =~ /BOB/i) Modified files: File: radiusd/src/main/evaluate.c; Revision: 1.11; Date: 2007/06/11 13:07:51; Author: aland; Lines: (+26 -9) ------------------------------- Description: Update result only if we were told to evaluate the condition Modified files: File: radiusd/src/main/evaluate.c; Revision: 1.10; Date: 2007/06/11 08:34:28; Author: aland; Lines: (+4 -4) ------------------------------- Description: Clean up printing Modified files: File: radiusd/src/main/evaluate.c; Revision: 1.9; Date: 2007/06/11 08:26:53; Author: aland; Lines: (+6 -12) ------------------------------- Description: Do more work to clean up on exit Modified files: File: radiusd/src/main/modcall.c; Revision: 1.69; Date: 2007/06/11 13:02:53; Author: aland; Lines: (+14 -4) ------------------------------- Description: Moved check for top of stack to BEFORE printing out result Modified files: File: radiusd/src/main/modcall.c; Revision: 1.68; Date: 2007/06/11 08:44:32; Author: aland; Lines: (+4 -4) ------------------------------- Description: Initialize the whole of the local VP to prevent uninitialized stuff Modified files: File: radiusd/src/main/xlat.c; Revision: 1.123; Date: 2007/06/11 08:57:02; Author: aland; Lines: (+4 -4) ===================================================== Summary of modified files ===================================================== File: radiusd/share/dictionary Revisions: 1.141 Authors: aland (+2 -1) ------------------------------- File: radiusd/share/dictionary.quiconnect Revisions: 1.2, 1.1 Authors: aland (+3 -3), aland ------------------------------- File: radiusd/src/main/evaluate.c Revisions: 1.11, 1.10, 1.9 Authors: aland (+26 -9), aland (+4 -4), aland (+6 -12) ------------------------------- File: radiusd/src/main/modcall.c Revisions: 1.69, 1.68 Authors: aland (+14 -4), aland (+4 -4) ------------------------------- File: radiusd/src/main/xlat.c Revisions: 1.123 Authors: aland (+4 -4) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl

1 0

[Patch] Pre-Acct-Type dict value registration
by Lv Zheng 11 Jun '07

11 Jun '07

Hi, all I noticed that there might be codes missing in modules.c for Pre-Acct-Type. This will crash the radiusd server if thre is pre-acct sub-list in radiusd.conf. The patch is created for FreeRADIUS-1.1.2, I've tested it against FreeRADIUS-1.1.6. Best regards, Lv Zheng Index: freeradius-1.1.2/src/main/modules.c =================================================================== --- freeradius-1.1.2.orig/src/main/modules.c 2007-04-26 06:02:03.000000000 +0800 +++ freeradius-1.1.2/src/main/modules.c 2007-04-26 06:02:32.000000000 +0800 @@ -497,6 +497,8 @@ dval = dict_valbyname(PW_AUTH_TYPE, cf_section_name2(cs)); } else if (comp == RLM_COMPONENT_AUTZ) { dval = dict_valbyname(PW_AUTZ_TYPE, cf_section_name2(cs)); + } else if (comp == RLM_COMPONENT_PREACCT) { + dval = dict_valbyname(PW_PRE_ACCT_TYPE, cf_section_name2(cs)); } else if (comp == RLM_COMPONENT_ACCT) { dval = dict_valbyname(PW_ACCT_TYPE, cf_section_name2(cs)); } else if (comp == RLM_COMPONENT_SESS) { ============================================= Soliton Network Systems (Shanghai) Co., Ltd. EMAIL: lv.zheng(a)soliton.com.cn =============================================

4 5

v2 Conditions bug
by Arran Cudbard-Bell 11 Jun '07

11 Jun '07

elsif((("%{Supplicant-Flags}" == "")||("%{Supplicant-Flags}" =~ /^10........$/)) && ("%{Pre-Proxy-Realm}" == "sussex.ac.uk")){ update config { Autz-Type := "soft-ban" } } generates ++? elsif ((("%{Supplicant-Flags}" == "")||("%{Supplicant-Flags}" =~ /^10........$/)) && ("%{Pre-Proxy-Realm}" == "sussex.ac.uk")) radius_xlat: '0000000000' ??? Evaluating ("%{Supplicant-Flags}" == "") -> FALSE radius_xlat: '0000000000' ??? Evaluating ("%{Supplicant-Flags}" =~ /^10........$/) -> FALSE ?? Skipping ("%{Pre-Proxy-Realm}" == "sussex.ac.uk") ++? elsif ((("%{Supplicant-Flags}" == "")||("%{Supplicant-Flags}" =~ /^10........$/)) && ("%{Pre-Proxy-Realm}" == "sussex.ac.uk")) -> TRUE So it's evaluated the zero length condition found it to be false evaluated Supplicant-Flags regex found it to be false. Skipped the && and should return false but instead returns true. Also leaving Autz-Type module{ } Empty results in "Bus error" If the requests hits one, and the process dies, Might be good to check when parsing the config file for empty Autz-Type declarations . Though it's a very minor issue. -- Arran Cudbard-Bell (A.Cudbard-Bell(a)sussex.ac.uk) Authentication, Authorisation and Accounting Officer Infrastructure Services | ENG1 E1-1-08 University Of Sussex, Brighton EXT:01273 873900 | INT: 3900

2 2

Automatic report from sources (radiusd) between 10.06.2007 - 11.06.2007 GMT
by Automatic cvs log generator 11 Jun '07

11 Jun '07

CVS log entries from 10.06.2007 (Sun) 08:00:01 - 11.06.2007 (Mon) 08:00:01 GMT ===================================================== Summary by authors ===================================================== Author: aland File: radiusd/src/main/evaluate.c; Revisions: 1.8 ===================================================== Log entries ===================================================== Description: When parsing a condition, if the next thing is !=, it's part of the current condition. But if the next thing is !, it's not Modified files: File: radiusd/src/main/evaluate.c; Revision: 1.8; Date: 2007/06/11 07:39:12; Author: aland; Lines: (+4 -4) ===================================================== Summary of modified files ===================================================== File: radiusd/src/main/evaluate.c Revisions: 1.8 Authors: aland (+4 -4) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl

1 0

SQL driver for freetds-0.64
by Lv Zheng 10 Jun '07

10 Jun '07

Hello, all I created an sql module using FreeTDS-0.64. I've tested the module against Microsft SQL Server 2000 developer version, sql accounting, checksimul and sqlcounter can work with this module. Embedded solutions may require this module to connect SQL servers, having not unixODBC installed. The patch is developed in FreeRADIUS-1.1.2 environment, it can also be applied to FreeRADIUS-1.1.6. Hopes this will be useful for someone. Best regards, Lv Zheng Index: freeradius-1.1.2/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ freeradius-1.1.2/src/modules/rlm_sql/drivers/rlm_sql_freetds/configure.in 2007-04-26 06:23:25.000000000 +0800 @@ -0,0 +1,83 @@ +AC_INIT(sql_freetds.c) +AC_REVISION($Revision: 1.1 $) +AC_DEFUN(modname,[rlm_sql_freetds]) + +fail= +SMART_LIBS= +SMART_CLFAGS= +if test x$with_[]modname != xno; then + + AC_PROG_CC + + dnl extra argument: --with-rlm-sql-freetds-lib-dir + rlm_sql_freetds_lib_dir= + AC_ARG_WITH(rlm-sql-freetds-lib-dir, + [ --with-rlm-sql-freetds-lib-dir=DIR Directory for FreeTDS library files []], + [ case "$withval" in + no) + AC_MSG_ERROR(Need rlm-sql-freetds-lib-dir) + ;; + yes) + ;; + *) + rlm_sql_freetds_lib_dir="$withval" + ;; + esac ] + ) + + dnl extra argument: --with-rlm-sql-freetds-include-dir + rlm_sql_freetds_include_dir= + AC_ARG_WITH(rlm-sql-freetds-include-dir, + [ --with-rlm-sql-freetds-include-dir=DIR Directory for FreeTDS include files []], + [ case "$withval" in + no) + AC_MSG_ERROR(Need rlm-sql-freetds-include-dir) + ;; + yes) + ;; + *) + rlm_sql_freetds_include_dir="$withval" + ;; + esac ] + ) + + smart_try_dir="$rlm_sql_freetds_include_dir /usr/include/ /usr/local/freetds/include/" + AC_SMART_CHECK_INCLUDE(tds.h) + if test "x$ac_cv_header_tds_h" != "xyes"; then + fail="$fail tds.h" + fi + + smart_try_dir="$rlm_sql_freetds_lib_dir /usr/lib /usr/local/freetds/lib" + AC_SMART_CHECK_LIB(tds, tds_connect) + if test "x$ac_cv_lib_tds_tds_connect" != "xyes"; then + fail="$fail libtds" + fi + + targetname=modname +else + targetname= + echo \*\*\* module modname is disabled. +fi + +if test x"$fail" != x""; then + if test x"${enable_strict_dependencies}" = x"yes"; then + AC_MSG_ERROR([set --without-]modname[ to disable it explicitly.]) + else + AC_MSG_WARN([silently not building ]modname[.]) + AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]) + if test x"$headersuggestion" != x; then + AC_MSG_WARN([$headersuggestion]) + fi + if test x"$libsuggestion" != x; then + AC_MSG_WARN([$libsuggestion]) + fi + targetname="" + fi +fi + +freetds_ldflags=$SMART_LIBS +freetds_cflags=$SMART_CFLAGS +AC_SUBST(freetds_ldflags) +AC_SUBST(freetds_cflags) +AC_SUBST(targetname) +AC_OUTPUT(Makile) Index: freeradius-1.1.2/src/modules/rlm_sql/stable =================================================================== --- freeradius-1.1.2.orig/src/modules/rlm_sql/stable 2007-04-26 05:29:09.000000000 +0800 +++ freeradius-1.1.2/src/modules/rlm_sql/stable 2007-04-26 06:23:25.000000000 +0800 @@ -3,3 +3,4 @@ rlm_sql_postgresql rlm_sql_oracle rlm_sql_unixodbc +rlm_sql_freetds Index: freeradius-1.1.2/src/modules/rlm_sql/drivers/rlm_sql_freetds/Makefile.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ freeradius-1.1.2/src/modules/rlm_sql/drivers/rlm_sql_freetds/Makefile.in 2007-04-26 06:23:25.000000000 +0800 @@ -0,0 +1,8 @@ +include ../../../../../Make.inc + +TARGET = @targetname@ +SRCS = sql_freetds.c +RLM_SQL_CFLAGS = @freetds_cflags@ $(INCLTDL) +RLM_SQL_LIBS = @freetds_ldflags@ + +include ../rules.mak Index: freeradius-1.1.2/src/modules/rlm_sql/drivers/rlm_sql_freetds/sql_freetds.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ freeradius-1.1.2/src/modules/rlm_sql/drivers/rlm_sql_freetds/sql_freetds.c 2007-04-26 06:24:31.000000000 +0800 @@ -0,0 +1,535 @@ +/************************************************************************** + * sql_freetds.c FreeTDS rlm_sql driver * + * * + * Some pieces of code were adopted from FreeTDS project. * + * FreeTDS home page - http://www.freetds.org/ * + * * + * Dmitri Ageev <d_ageev(a)ortcc.ru> * + **************************************************************************/ + +#include <stdio.h> +#include <sys/stat.h> +#include <stdlib.h> +#include <string.h> + +#include "radiusd.h" + +#include <tds.h> +#include "rlm_sql.h" + +typedef struct rlm_sql_freetds_sock { + TDSSOCKET *tds_socket; + TDSLOGIN *tds_login; + TDSCONTEXT *tds_context; + char **row; + void *conn; +} rlm_sql_freetds_sock;; + +#include <tds.h> +#include <tdsconvert.h> + +struct main_config_t *rad_mainconfig = NULL; + +static int sql_use_database(TDSSOCKET *tds, const char *name); +static int sql_close(SQLSOCK * sqlsocket, SQL_CONFIG *config); + +/************************************************************************* + * + * Function: sql_destroy_socket + * + * Purpose: Free socket and private connection data + * + *************************************************************************/ +static int sql_destroy_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + + if (tds_socket) { + sql_close(sqlsocket, config); + free(tds_socket); + tds_socket = NULL; + } + return 0; +} + +/************************************************************************* + * + * Function: sql_init_socket + * + * Purpose: Establish connection to the db + * + *************************************************************************/ +static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket; + TDSCONNECTION *connection; + + if (!sqlsocket->conn) { + sqlsocket->conn = (rlm_sql_freetds_sock *)malloc(sizeof(rlm_sql_freetds_sock)); + if (!sqlsocket->conn) { + return -1; + } + memset(sqlsocket->conn, 0, sizeof (rlm_sql_freetds_sock)); + } + tds_socket = sqlsocket->conn; + memset(tds_socket, 0, sizeof(*tds_socket)); + + radlog(L_DBG, "tds: Starting connect to TDS server for #%d", + sqlsocket->id); + + tds_socket->tds_login = tds_alloc_login(); + if (!tds_socket->tds_login) { + radlog(L_ERR, "tds: tds_alloc_login() failed."); + sql_close(sqlsocket, config); + return -1; + } + tds_set_version(tds_socket->tds_login, 8, 0); + tds_set_passwd(tds_socket->tds_login, config->sql_password); + tds_set_user(tds_socket->tds_login, config->sql_login); + tds_set_server(tds_socket->tds_login, config->sql_server); + tds_set_port(tds_socket->tds_login, atoi(config->sql_port)); + tds_set_app(tds_socket->tds_login, "radius"); + /* + tds_set_host(tds_socket->tds_login, "myhost"); + tds_set_library(tds_socket->tds_login, "TDS-Library"); + tds_set_client_charset(tds_socket->tds_login, "ISO-8859-1"); + tds_set_language(tds_socket->tds_login, "us_english"); + */ + + tds_socket->tds_context = tds_alloc_context(NULL); + tds_socket->tds_socket = tds_alloc_socket(tds_socket->tds_context, 512); + tds_set_parent(tds_socket->tds_socket, NULL); + connection = tds_read_config_info(NULL, tds_socket->tds_login, tds_socket->tds_context->locale); + + if (!connection || tds_connect(tds_socket->tds_socket, connection) == TDS_FAIL) { + if (connection) { + tds_free_socket(tds_socket->tds_socket); + tds_socket->tds_socket = NULL; + tds_free_connection(connection); + } + radlog(L_ERR, "tds: Couldn't connect socket to TDS server %s@%s", + config->sql_login, config->sql_server); + sql_close(sqlsocket, config); + return -1; + } + tds_free_connection(connection); + if (sql_use_database(tds_socket->tds_socket, config->sql_db) != 0) { + radlog(L_ERR, "tds: Couldn't use TDS database %s", + config->sql_db); + sql_close(sqlsocket, config); + return -1; + } + return 0; +} + +static int sql_process_result(TDSSOCKET * tds) +{ + int rc; + int result_type; + + while ((rc = tds_process_tokens(tds, &result_type, NULL, TDS_TOKEN_RESULTS)) == TDS_SUCCEED) { + switch (result_type) { + case TDS_DONE_RESULT: + case TDS_DONEPROC_RESULT: + case TDS_DONEINPROC_RESULT: + /* ignore possible spurious result (TDS7+ send it) */ + case TDS_STATUS_RESULT: + break; + default: + radlog(L_ERR, "tds: query should not return results"); + return -1; + } + } + if (rc == TDS_FAIL) { + radlog(L_ERR, "tds: tds_process_tokens() returned TDS_FAIL"); + return -1; + } else if (rc != TDS_NO_MORE_RESULTS) { + radlog(L_ERR, "tds: tds_process_tokens() unexpected return"); + return -1; + } + return 0; +} + +static int sql_use_database(TDSSOCKET *tds, const char *name) +{ + char query[512]; + + strcpy(query, "use "); + if (name[0] == '[' && name[strlen(name)-1] == ']') + strcat(query, name); + else + tds_quote_id(tds, query + 4, name, -1); + if (tds_submit_query(tds, query) != TDS_SUCCEED) { + radlog(L_ERR, "tds: tds_submit_query() failed"); + return -1; + } + if (tds_process_simple_query(tds) != TDS_SUCCEED) { + return -1; + } + return 0; +} + +/************************************************************************* + * + * Function: sql_query + * + * Purpose: Issue a non-SELECT query (ie: update/delete/insert) to + * the database. + * + *************************************************************************/ +static int sql_query(SQLSOCK * sqlsocket, SQL_CONFIG *config, char *querystr) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + + if (config->tracefile) + radlog(L_DBG, "query: %s", querystr); + if (tds_socket->tds_socket == NULL) { + radlog(L_ERR, "tds: Socket not connected"); + return SQL_DOWN; + } + + if (tds_submit_query(tds_socket->tds_socket, querystr) != TDS_SUCCEED) { + radlog(L_ERR, "tds: tds_submit_query() failed"); + return -1; + } + if (tds_process_simple_query(tds_socket->tds_socket) != TDS_SUCCEED) { + return -1; + } + return 0; +} + +/************************************************************************* + * + * Function: sql_num_fields + * + * Purpose: database specific num_fields function. Returns number + * of columns from query + * + *************************************************************************/ +static int sql_num_fields(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + TDSRESULTINFO *result_info; + + /* Get information about the resulting set */ + result_info = tds_socket->tds_socket->res_info; + if (result_info == NULL) { + radlog(L_ERR, "tds: Can't get information about the resulting set"); + return -1; + } + return result_info->num_cols; +} + +/************************************************************************* + * + * Function: sql_free_result + * + * Purpose: database specific free_result. Frees memory allocated + * for a result set + * + *************************************************************************/ +static int sql_free_result(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + int column, numfileds = sql_num_fields(sqlsocket, config); + + /* Freeing reserved memory */ + if (tds_socket->row != NULL) { + for (column=0; column < numfileds; column++) { + if (tds_socket->row[column] != NULL) { + free(tds_socket->row[column]); + tds_socket->row[column] = NULL; + } + } + free(tds_socket->row); + tds_socket->row = NULL; + } + return 0; +} + +/************************************************************************* + * + * Function: sql_store_result + * + * Purpose: database specific function. + * Reserve memory for the result set of a query. + * + *************************************************************************/ +static int sql_store_result(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + TDSCOLUMN **columns; + int numfields, column; + + /* Check if memory were allocated */ + if (tds_socket->row != NULL) + sql_free_result(sqlsocket, config); + + /* Getting amount of result fields */ + numfields = sql_num_fields(sqlsocket, config); + if (numfields < 0) return -1; + + /* Get information about the column set */ + columns = tds_socket->tds_socket->res_info->columns; + if (columns == NULL) { + radlog(L_ERR, "tds: Can't get information about the column set"); + return -1; + } + + /* Reserving memory for a result set */ + tds_socket->row = (char **) malloc((numfields+1)*sizeof(char *)); + if (tds_socket->row == NULL) { + radlog(L_ERR, "tds: Can't allocate the memory"); + return -1; + } + + for (column = 0; column < numfields; column++) + tds_socket->row[column] = NULL; + tds_socket->row[numfields] = NULL; + + return 0; +} + +/************************************************************************* + * + * Function: sql_select_query + * + * Purpose: Issue a select query to the database + * + *************************************************************************/ +static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, + char *querystr) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + TDS_INT result_type; + int rc; + + rc = tds_submit_query(tds_socket->tds_socket, querystr); + if (rc != TDS_SUCCEED) { + radlog(L_ERR, "tds: tds_submit_query() failed"); + return -1; + } + + if (tds_process_tokens(tds_socket->tds_socket, &result_type, NULL, TDS_TOKEN_RESULTS) != TDS_SUCCEED) { + radlog(L_ERR, "tds: tds_process_tokens() failed"); + return -1; + } + if (result_type != TDS_ROWFMT_RESULT) { + radlog(L_ERR, "tds: expected row fmt() failed"); + return -1; + } + if (tds_process_tokens(tds_socket->tds_socket, &result_type, NULL, TDS_TOKEN_RESULTS) != TDS_SUCCEED) { + radlog(L_ERR, "tds: tds_process_tokens() failed"); + return -1; + } + if (result_type != TDS_ROW_RESULT) { + /* no result */ + return -1; + } + return 0; +} + +/************************************************************************* + * + * Function: sql_fetch_row + * + * Purpose: database specific fetch_row. Returns a SQL_ROW struct + * with all the data for the query in 'sqlsocket->row'. Returns + * 0 on success, -1 on failure, SQL_DOWN if 'database is down' + * + *************************************************************************/ +static int sql_fetch_row(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + TDSRESULTINFO *result_info; + TDSCOLUMN **columns; + int numfields, column, ret, rc, result_type; + CONV_RESULT cr; + + sqlsocket->row = NULL; + + /* Alocating the memory */ + if (sql_store_result(sqlsocket, config) < 0) return 0; + + /* Getting amount of result fields */ + numfields = sql_num_fields(sqlsocket, config); + if (numfields < 0) + return 0; + /* Get information about the resulting set */ + result_info = tds_socket->tds_socket->res_info; + if (result_info == NULL) { + radlog(L_ERR, "tds: Can't get information about the resulting set"); + return -1; + } + /* Get information about the column set */ + columns = result_info->columns; + if (columns == NULL) { + radlog(L_ERR, "tds: Can't get information about the column set"); + return -1; + } + + while ((rc = tds_process_tokens(tds_socket->tds_socket, &result_type, NULL, + TDS_STOPAT_ROWFMT|TDS_RETURN_DONE| + TDS_RETURN_ROW|TDS_RETURN_COMPUTE)) == TDS_SUCCEED) { + if (result_type == TDS_ROW_RESULT || result_type == TDS_COMPUTE_RESULT) { + /* Converting the fields to a CHAR data type */ + for (column = 0; column < numfields; column++) { + TDSCOLUMN *curcol = tds_socket->tds_socket->current_results->columns[column]; + TDS_CHAR *src = (TDS_CHAR *) tds_socket->tds_socket->current_results->current_row + curcol->column_offset; + int conv_type = tds_get_conversion_type(curcol->column_type, curcol->column_size); + + if (is_blob_type(columns[column]->column_type)) { + TDSBLOB *blob = (TDSBLOB *) src; + src = blob->textvalue; + } + if (src && curcol->column_cur_size >= 0) { + ret = tds_convert(tds_socket->tds_context, conv_type, src, + curcol->column_cur_size, + SYBVARCHAR, &cr); + if (ret < 0) { + radlog(L_ERR, "tds: Error converting"); + return -1; + } else { + tds_socket->row[column] = cr.c; + } + } + } + sqlsocket->row = tds_socket->row; + return 0; + } + } + if (rc != TDS_NO_MORE_RESULTS && rc != TDS_SUCCEED) { + radlog(L_ERR, "tds: tds_process_tokens() unexpected return"); + return -1; + } + return -1; +} + +/************************************************************************* + * + * Function: sql_affected_rows + * + * Purpose: Return the number of rows affected by the query (update, + * or insert) + * + *************************************************************************/ +static int sql_affected_rows(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + return tds_socket->tds_socket->rows_affected; +} + +/************************************************************************* + * + * Function: sql_num_rows + * + * Purpose: database specific num_rows. Returns number of rows in + * query + * + *************************************************************************/ +static int sql_num_rows(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + return sql_affected_rows(sqlsocket, config); +} + +/************************************************************************* + * + * Function: sql_error + * + * Purpose: database specific error. Returns error associated with + * connection + * + *************************************************************************/ +static const char *sql_error(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + + if (tds_socket == NULL || tds_socket->tds_socket == NULL) { + return "tds: no connection to db"; + } + return NULL; +} + +/************************************************************************* + * + * Function: sql_close + * + * Purpose: database specific close. Closes an open database + * connection and cleans up any open handles. + * + *************************************************************************/ +static int sql_close(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + if (tds_socket) { + if (tds_socket->tds_socket) { + tds_free_socket(tds_socket->tds_socket); + tds_socket->tds_socket = NULL; + } + if (tds_socket->tds_login) { + tds_free_login(tds_socket->tds_login); + tds_socket->tds_login = NULL; + } + if (tds_socket->tds_context) { + tds_free_context(tds_socket->tds_context); + tds_socket->tds_context = NULL; + } + } + return 0; +} + +/************************************************************************* + * + * Function: sql_finish_query + * + * Purpose: End the query, such as freeing memory + * + *************************************************************************/ +static int sql_finish_query(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + + return sql_process_result(tds_socket->tds_socket); +} + +/************************************************************************* + * + * Function: sql_finish_select_query + * + * Purpose: End the select query, such as freeing memory or result + * + *************************************************************************/ +static int sql_finish_select_query(SQLSOCK * sqlsocket, SQL_CONFIG *config) +{ + rlm_sql_freetds_sock *tds_socket = sqlsocket->conn; + + sql_free_result(sqlsocket, config); + /* make sure the current statement is complete */ + if (tds_socket->tds_socket->state == TDS_PENDING) { + /* send 'cancel' packet */ + tds_send_cancel(tds_socket->tds_socket); + /* process 'cancel' packet */ + tds_process_cancel(tds_socket->tds_socket); + } + return 0; +} + +/* Exported to rlm_sql */ +rlm_sql_module_t rlm_sql_freetds = { + "rlm_sql_freetds", + sql_init_socket, + sql_destroy_socket, + sql_query, + sql_select_query, + sql_store_result, + sql_num_fields, + sql_num_rows, + sql_fetch_row, + sql_free_result, + sql_error, + sql_close, + sql_finish_query, + sql_finish_select_query, + sql_affected_rows +}; + ============================================= Soliton Network Systems (Shanghai) Co., Ltd. EMAIL: lv.zheng(a)soliton.com.cn =============================================

3 3

Connecting to Checkpoint Firewall.
by Arnnei Speiser 10 Jun '07

10 Jun '07

Hi All, We are having trouble to connect FreeRadius to Checkpoint firewall and wonder/hope somebody knows Checkpoint well enough to help out. The FreeRadius is installed on a DNZ server and connects to Checkpoint through a Router. The Free Radius gets the Authentication request and responds correctly, but at the Checkpoint it is as if there is no response from FreeRadius. It seems like it is lost at the router.... Has anybody gone through this type of configuration - I'm sure we are missing some configuration thingy. Cheers, Arnnei

1 0

Automatic report from sources (radiusd) between 08.06.2007 - 09.06.2007 GMT
by Automatic cvs log generator 09 Jun '07

09 Jun '07

CVS log entries from 08.06.2007 (Fri) 08:00:01 - 09.06.2007 (Sat) 08:00:00 GMT ===================================================== Summary by authors ===================================================== Author: nbk File: radiusd/doc/RADIUS-SQL.schema; Revisions: 1.4.10.2 ===================================================== Log entries ===================================================== Description: Update location of sample schema files and remove a dead link. (closes: #444) Patch from Thor Spruyt <thor.spruyt(a)pandora.be> Modified files: File: radiusd/doc/RADIUS-SQL.schema; Revision: 1.4.10.2; Date: 2007/06/08 11:59:01; Author: nbk; Lines: (+4 -5) ===================================================== Summary of modified files ===================================================== File: radiusd/doc/RADIUS-SQL.schema Revisions: 1.4.10.2 Authors: nbk (+4 -5) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl

1 0

Automatic report from sources (radiusd) between 04.06.2007 - 05.06.2007 GMT
by Automatic cvs log generator 05 Jun '07

05 Jun '07

CVS log entries from 04.06.2007 (Mon) 08:00:00 - 05.06.2007 (Tue) 08:00:00 GMT ===================================================== Summary by authors ===================================================== Author: nbk File: radiusd/src/lib/udpfromto.c; Revisions: 1.13 ===================================================== Log entries ===================================================== Description: It seems sendmsg(2) returns -1 (at least on my system) when the msgh.msg_controllen value is too big. Modified files: File: radiusd/src/lib/udpfromto.c; Revision: 1.13; Date: 2007/06/04 13:23:08; Author: nbk; Lines: (+23 -14) ===================================================== Summary of modified files ===================================================== File: radiusd/src/lib/udpfromto.c Revisions: 1.13 Authors: nbk (+23 -14) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl

1 0

Automatic report from sources (radiusd) between 03.06.2007 - 04.06.2007 GMT
by Automatic cvs log generator 04 Jun '07

04 Jun '07

CVS log entries from 03.06.2007 (Sun) 08:00:02 - 04.06.2007 (Mon) 08:00:00 GMT ===================================================== Summary by authors ===================================================== Author: nbk File: radiusd/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c; Revisions: 1.26, 1.18.4.2 ===================================================== Combined list of identical log entries ===================================================== Description: Add support for MySQL stored procedures. (closes: #449) Modified files: File: radiusd/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c; Revision: 1.26; Date: 2007/06/03 23:27:39; Author: nbk; Lines: (+87 -12) File: radiusd/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c; Revision: 1.18.4.2; Date: 2007/06/03 23:27:51; Author: nbk; Lines: (+88 -11) ===================================================== Log entries ===================================================== ===================================================== Summary of modified files ===================================================== File: radiusd/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c Revisions: 1.26, 1.18.4.2 Authors: nbk (+87 -12), nbk (+88 -11) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl

1 0