- Freeradius-Devel - lists.freeradius.org

evaluate.c & strings with "\" in them
by Phil Mayers 11 Oct '12

11 Oct '12

If I do this: echo User-Name='foo\bar' | radclient ... ...and try to match this in unlang: if (User-Name =~ /^(.+)\\\\(.+)$/) { ...which corresponds to a regex: ^(.+)\\(.+)$ ...it doesn't work. I think this is because evaluate.c:radius_do_cmp calls vp_print_value(..., 0) for T_OP_REG_*. That final arugment "0" means "escape the string" so the value compared against gets turned into: foo\\bar ...which needs a regex: ^(.+)\\\\(.+)$ ...which needs a condition: if (User-Name =~ /^(.+)\\\\\\\\(.+)$/) { This seems a bit crazy, but is also inconsistent with the "users"-file stuff in valuepair.c - this uses radius_xlat (or vp_prints_value directly, now) which finishes up in "vp_prints_value(..., -1) which means "value verbatim", so doesn't need quad-escaping. The fix is pretty simple: https://github.com/philmayers/freeradius-server/commit/2695a37464560dbd42b1… ...but is sadly not a backwards-compatible change. The other thing is, do we actually need to handle "\" inside // at all, with the exception of escaping the regex delimiter? Or could we just pass "\" straight through to to the regex engine? To give you an idea of what I mean (with a bit of extra flags magic too): https://github.com/philmayers/freeradius-server/commit/7c322b36d603d0189c72… if (User-Name =~ !^(.+)\\(.+)$!ims8) { ... } The choice of "!" is arbitrary, could be anything, indeed, could be selectable sed-style by inspecting the 1st character: if (User-Name =~ @regex@flags) ...but letting it be something other than "/" helps avoid leaning toothpick syndrome. Thoughts welcome. Just idly playing here really.

3 3

Help for Reply AVP
by Atif Razzaq 09 Oct '12

09 Oct '12

Hi Everyone I need your help regarding reply avps. The scenerio is that my reply items are lying in a column of table in Database. Now all the reply items are there seperated by comma(,) e.g. ReplyItem1=ReplyValue1,ReplyItem2=ReplyValue2,ReplyItem3=ReplyValue3. All this is the content of a single column. When i want to send these reply items in response to a request, i have no way to do so because the reply query wants to have the reply items in tabular format as given in the dialup.cong under Authorization query. On the other hand, I can do the manipulation on DB side through a stored procedure or function but cannot return the resultset. Please guide for solution to this. Thanks in anticipation!!! -- Best Regards Atif Razzaq http://atif-razzaq.blogspot.com

2 1

Commit report for master branch
by announce＠freeradius.org 08 Oct '12

08 Oct '12

New activity for FreeRADIUS (the high performance and highly configurable RADIUS server) ====== Merge pull request #102 from philmayers/misc-fixes 3 minor fixes - regexp and foreach related Alan DeKok@2012-10-07T18:40:45Z Files modified: * src/lib/valuepair.c * src/main/valuepair.c * src/main/xlat.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/cd43552b7b687f8c5f89… ====== fix pairmake->pairmake_xlat->pairmake recursive calls with regexps; lets regexps work in "users" files again Phil Mayers@2012-10-06T15:00:47Z Files modified: * src/lib/valuepair.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/119c4cc4aa5ed48471a0… ====== different numbers of foreach and xlats - use separate loop Phil Mayers@2012-10-06T14:53:32Z Files modified: * src/main/xlat.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/521ad7b520dd506e07ec… ====== convert the VP we are passed rather than xlat the check->name; makes regex matches against multiple attributes work again Phil Mayers@2012-10-06T14:34:01Z Files modified: * src/main/valuepair.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/5a89c9463390987c5468… ====== -- This commit summary was generated @2012-10-08T18:00:01Z by lgfeed version 0.00 (https://github.com/arr2036/lgfeed)

1 0

Commit report for master branch
by announce＠freeradius.org 05 Oct '12

05 Oct '12

New activity for FreeRADIUS (the high performance and highly configurable RADIUS server) ====== Merge pull request #101 from philmayers/escape-context2 Re-work escape functions to have REQUEST* and context variables Alan DeKok@2012-10-05T14:07:43Z Files modified: * src/include/radiusd.h * src/main/auth.c * src/main/evaluate.c * src/main/exec.c * src/main/listen.c * src/main/log.c * src/main/mainconfig.c * src/main/modcall.c * src/main/radconf2xml.c * src/main/radmin.c * src/main/radwho.c * src/main/realms.c * src/main/tls.c * src/main/valuepair.c * src/main/xlat.c * src/modules/rlm_acctlog/rlm_acctlog.c * src/modules/rlm_attr_filter/rlm_attr_filter.c * src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c * src/modules/rlm_cache/rlm_cache.c * src/modules/rlm_detail/rlm_detail.c * src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c * src/modules/rlm_exec/rlm_exec.c * src/modules/rlm_expiration/rlm_expiration.c * src/modules/rlm_expr/paircmp.c * src/modules/rlm_expr/rlm_expr.c * src/modules/rlm_fastusers/rlm_fastusers.c * src/modules/rlm_files/rlm_files.c * src/modules/rlm_ippool/rlm_ippool.c * src/modules/rlm_ldap/rlm_ldap.c * src/modules/rlm_linelog/rlm_linelog.c * src/modules/rlm_logintime/rlm_logintime.c * src/modules/rlm_mschap/rlm_mschap.c * src/modules/rlm_pap/rlm_pap.c * src/modules/rlm_perl/rlm_perl.c * src/modules/rlm_policy/evaluate.c * src/modules/rlm_radutmp/rlm_radutmp.c * src/modules/rlm_redis/rlm_redis.c * src/modules/rlm_rediswho/rlm_rediswho.c * src/modules/rlm_rest/rest.c * src/modules/rlm_soh/rlm_soh.c * src/modules/rlm_sql/rlm_sql.c * src/modules/rlm_sql/rlm_sql.h * src/modules/rlm_sql/sql.c * src/modules/rlm_sql_log/rlm_sql_log.c * src/modules/rlm_sqlcounter/rlm_sqlcounter.c * src/modules/rlm_sqlippool/rlm_sqlippool.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/9fa5e646fecfb25e2d52… ====== pass redis instance to escape function - currently unused Phil Mayers@2012-10-05T13:53:14Z Files modified: * src/modules/rlm_redis/rlm_redis.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/f9a7f79f9531227423a3… ====== pass LDAP instance to escape function - currently unused Phil Mayers@2012-10-05T13:53:09Z Files modified: * src/modules/rlm_ldap/rlm_ldap.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/74139df68cca12180eab… ====== rlm_sqlcounter: remove SQL escaping, let the SQL module handle it Phil Mayers@2012-10-05T13:52:55Z Files modified: * src/modules/rlm_sqlcounter/rlm_sqlcounter.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/c38eb9198d497e9a9615… ====== rlm_sqlippool: pass sql instance to sql escape func Phil Mayers@2012-10-05T13:52:48Z Files modified: * src/modules/rlm_sqlippool/rlm_sqlippool.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/d58101e177e539084d92… ====== rlm_sql_log: use escape function argument to make safe-characters per-instance rather than global Phil Mayers@2012-10-05T13:52:41Z Files modified: * src/modules/rlm_sql_log/rlm_sql_log.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/5b0452541f9479257f5d… ====== rlm_sql: use escape function argument to make safe-characters per-instance rather than global Phil Mayers@2012-10-05T13:52:36Z Files modified: * src/modules/rlm_sql/rlm_sql.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/b2f9f15ce52f83e577ef… ====== no-op escape function no longer needed Phil Mayers@2012-10-05T13:52:31Z Files modified: * src/main/xlat.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/7e41b56db37903c24ff4… ====== remove dead code path Phil Mayers@2012-10-05T13:52:26Z Files modified: * src/main/xlat.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/225a3e205ca6f5fb9711… ====== add REQUEST* and void* to escape functions Phil Mayers@2012-10-05T13:52:20Z Files modified: * src/include/radiusd.h * src/main/mainconfig.c * src/main/xlat.c * src/modules/rlm_ldap/rlm_ldap.c * src/modules/rlm_linelog/rlm_linelog.c * src/modules/rlm_redis/rlm_redis.c * src/modules/rlm_sql/rlm_sql.c * src/modules/rlm_sql/rlm_sql.h * src/modules/rlm_sql_log/rlm_sql_log.c * src/modules/rlm_sqlcounter/rlm_sqlcounter.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/24160ee3c9ade21266ed… ====== remove escape function from xlat handlers; perform escaping *once* in decode_attribute Phil Mayers@2012-10-05T13:52:12Z Files modified: * src/include/radiusd.h * src/main/listen.c * src/main/mainconfig.c * src/main/realms.c * src/main/xlat.c * src/modules/rlm_cache/rlm_cache.c * src/modules/rlm_exec/rlm_exec.c * src/modules/rlm_expr/rlm_expr.c * src/modules/rlm_ldap/rlm_ldap.c * src/modules/rlm_mschap/rlm_mschap.c * src/modules/rlm_perl/rlm_perl.c * src/modules/rlm_redis/rlm_redis.c * src/modules/rlm_soh/rlm_soh.c * src/modules/rlm_sql/rlm_sql.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/ff6fedad6e110c1ee3f8… ====== add extra argument to radius_xlat for escape function context - currently unused Phil Mayers@2012-10-05T13:50:29Z Files modified: * src/include/radiusd.h * src/main/auth.c * src/main/evaluate.c * src/main/exec.c * src/main/log.c * src/main/mainconfig.c * src/main/modcall.c * src/main/radconf2xml.c * src/main/radmin.c * src/main/radwho.c * src/main/tls.c * src/main/valuepair.c * src/main/xlat.c * src/modules/rlm_acctlog/rlm_acctlog.c * src/modules/rlm_attr_filter/rlm_attr_filter.c * src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c * src/modules/rlm_cache/rlm_cache.c * src/modules/rlm_detail/rlm_detail.c * src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c * src/modules/rlm_expiration/rlm_expiration.c * src/modules/rlm_expr/paircmp.c * src/modules/rlm_expr/rlm_expr.c * src/modules/rlm_fastusers/rlm_fastusers.c * src/modules/rlm_files/rlm_files.c * src/modules/rlm_ippool/rlm_ippool.c * src/modules/rlm_ldap/rlm_ldap.c * src/modules/rlm_linelog/rlm_linelog.c * src/modules/rlm_logintime/rlm_logintime.c * src/modules/rlm_mschap/rlm_mschap.c * src/modules/rlm_pap/rlm_pap.c * src/modules/rlm_perl/rlm_perl.c * src/modules/rlm_policy/evaluate.c * src/modules/rlm_radutmp/rlm_radutmp.c * src/modules/rlm_redis/rlm_redis.c * src/modules/rlm_rediswho/rlm_rediswho.c * src/modules/rlm_rest/rest.c * src/modules/rlm_sql/rlm_sql.c * src/modules/rlm_sql/sql.c * src/modules/rlm_sql_log/rlm_sql_log.c * src/modules/rlm_sqlcounter/rlm_sqlcounter.c * src/modules/rlm_sqlippool/rlm_sqlippool.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/6b21a7d4dad3bef8bb85… ====== fix soh_xlat function prototype; fix warning about const discarded Phil Mayers@2012-10-05T13:49:57Z Files modified: * src/modules/rlm_soh/rlm_soh.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/b21906123aac2246966f… ====== fix redis_xlat function prototype and remove cast so compiler can detect errors Phil Mayers@2012-10-05T13:48:51Z Files modified: * src/modules/rlm_redis/rlm_redis.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/64f46c4823e479d53914… ====== fix cache_xlat function prototype and remove cast so compiler can detect errors Phil Mayers@2012-10-05T13:48:43Z Files modified: * src/modules/rlm_cache/rlm_cache.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/01d3092fa507fc467edc… ====== fix sql_xlat function prototype and remove cast so compiler can detect errors Phil Mayers@2012-10-05T13:47:58Z Files modified: * src/modules/rlm_sql/rlm_sql.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/1c907f6eee9dc216ba87… ====== Merge pull request #87 from armitasp/master Minor policy.d/operator-name fix Arran Cudbard-Bell@2012-10-04T18:11:40Z Files modified: * raddb/policy.d/operator-name * Make.inc.in * Makefile * configure * configure.in * debian/freeradius.default * doc/ChangeLog * doc/variables.rst * man/man1/radeapclient.1 * raddb/README.rst * raddb/attrs * raddb/mods-available/eap * raddb/mods-available/expr * raddb/sites-available/tls * redhat/README * redhat/freeradius.spec * scripts/Makefile * scripts/git/post-receive * scripts/install.mk * scripts/jlibtool.c * scripts/libtool.mk * share/dictionary * share/dictionary.alcatel.sr * share/dictionary.bskyb * share/dictionary.paloalto * src/include/autoconf.h.in * src/include/radiusd.h * src/include/tls.h * src/lib/Makefile * src/lib/dhcp.c * src/lib/tcp.c * src/main/Makefile.in * src/main/auth.c * src/main/checkrad.pl.in * src/main/command.c * src/main/modcall.c * src/main/process.c * src/main/radclient.c * src/main/radiusd.c * src/main/radtest.in * src/main/threads.c * src/main/tls.c * src/main/version.c * src/main/xlat.c * src/modules/rlm_chap/rlm_chap.c * src/modules/rlm_eap/libeap/Makefile * src/modules/rlm_eap/mem.c * src/modules/rlm_eap/radeapclient.c * src/modules/rlm_eap/types/rlm_eap_peap/peap.c * src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c * src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c * src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c * src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c * src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c * src/modules/rlm_expr/rlm_expr.c * src/modules/rlm_ldap/rlm_ldap.c * src/modules/rlm_pap/rlm_pap.c * src/modules/rlm_pap/rlm_pap.h * src/modules/rlm_sql/all.mk * src/modules/rlm_sql/drivers/rlm_sql_mysql/all.mk.in * src/modules/rlm_sql/drivers/rlm_sql_mysql/configure * src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in * src/modules/rlm_sql/drivers/rules.mak * src/modules/rules.mak Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/150632fdd65c494fda97… ====== Minor Fix to policy.d/operator-name fixed Packet-Type unlang match Scott Armitage@2012-09-12T23:23:37Z Files modified: * raddb/policy.d/operator-name Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/8ad4faac350ba983f26f… ====== -- This commit summary was generated @2012-10-05T18:00:02Z by lgfeed version 0.00 (https://github.com/arr2036/lgfeed)

1 0

SQL escaping
by Phil Mayers 05 Oct '12

05 Oct '12

All, I'd like to add a patch that uses the correct escaping function - for example, PQescapeStringConn in libpq - when expanding SQL strings. For various reason we find the "safe-characters" encoding a bit limiting for us. I did look at adding a per-module selectable escaping function with the current "safe" option as the default and a "\xNN" for non-ascii characters, but this again has some issues. It seems like it might be a good idea to use the underlying SQL driver escape function if one is present. Unfortunately this is a bit more complex than it first looks. In particular, the RADIUS_ESCAPE_FUNC prototype only receives the in, out and length params - no reference to the request or any other context it is called from. Also, it's not beyond the realm of possibility that someone might want to interpolate strings into a query other than arguments e.g. update control { Tmp-String-0 := "table1" } update control { Tmp-Integer-0 := "%{sql:select * from %{control:Tmp-String-0} ...}" } Does anyone have any insight into how to go about this? In particular, I note that the libpq API requires a reference to the connection object you're about to send the query down, because per-connection attributes (like client encoding) might affect the escaping. This could be doubly troublesome if you are talking to >1 backend with distinct SQL settings (a bad idea I know). Suggestions welcome - is this more trouble than it's worth? Cheers, Phil

3 16

Commit report for master branch
by announce＠freeradius.org 04 Oct '12

04 Oct '12

New activity for FreeRADIUS (the high performance and highly configurable RADIUS server) ====== Merge pull request #99 from sionescu/wip-fix-with-system-libtool Fix --with-system-libltdl and --with-system-libtool Alan DeKok@2012-10-04T12:40:51Z Files modified: * configure.in * debian/freeradius.default * raddb/README.rst * src/modules/rlm_pap/rlm_pap.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/15605a7fa862bfb7ee95… ====== Fix --with-system-libltdl and --with-system-libtool Stelian Ionescu@2012-10-02T20:00:24Z Files modified: * configure.in Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/0fbc2861a7a5d3fc548f… ====== Fix formatting Arran Cudbard-Bell@2012-10-03T19:31:21Z Files modified: * raddb/README.rst Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/7766f9abb33f762057f8… ====== Merge pull request #100 from mcnewton/rlm_pap_tidy Rlm pap tidy Arran Cudbard-Bell@2012-10-03T19:29:29Z Files modified: * raddb/README.rst * src/modules/rlm_pap/rlm_pap.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/bdf13e81987a3b11c20a… ====== update upgrade documentation with User-Password deprecation note Matthew Newton@2012-10-03T18:43:49Z Files modified: * raddb/README.rst Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/8a462ae09e86f8a7f4da… ====== remove auth check against User-Password, add autz warning Matthew Newton@2012-10-03T18:43:49Z Files modified: * src/modules/rlm_pap/rlm_pap.c Commit diff: https://github.com/FreeRADIUS/freeradius-server/commit/24d7921c043792b3428c… ====== -- This commit summary was generated @2012-10-04T18:00:02Z by lgfeed version 0.00 (https://github.com/arr2036/lgfeed)

1 0

building trouble
by marco perugini 04 Oct '12

04 Oct '12

hi list! saturday we tried to build latest snapshot from git but we got the following errors; does anyone know what is changed about libtool? are we missing something? we're on a centos 6.3 box.. thanks, marco ## make output ## ... Makefile:37: target `rlm_wimax' given more than once in the same rule. Making all in src/modules/rlm_wimax... Making all in src/modules/rlm_acctlog... Making all in src/modules/rlm_always... CC rlm_wimax.c CC rlm_acctlog.c Making all in src/modules/rlm_attr_filter... CC rlm_always.c CC rlm_attr_filter.c Making all in src/modules/rlm_attr_rewrite... Making all in src/modules/rlm_cache... Making all in src/modules/rlm_chap... Making all in src/modules/rlm_checkval... CC rlm_cache.c CC rlm_attr_rewrite.c CC rlm_chap.c CC rlm_checkval.c rlm_cache.c: In function 'cache_entry_free': rlm_cache.c:77: warning: passing argument 1 of 'free' discards qualifiers from pointer target type /usr/include/stdlib.h:488: note: expected 'void *' but argument is of type 'const char *' rlm_cache.c: In function 'cache_detach': rlm_cache.c:460: warning: passing argument 1 of 'free' discards qualifiers from pointer target type /usr/include/stdlib.h:488: note: expected 'void *' but argument is of type 'const char *' LINK rlm_acctlog.la rlm_acctlog.lo LINK rlm_always.la rlm_always.lo LINK rlm_chap.la rlm_chap.lo LINK rlm_checkval.la rlm_checkval.lo libtool: link: libtool library `rlm_acctlog.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_acctlog.la] Error 1 gmake[5]: *** [rlm_acctlog] Error 2 gmake[5]: *** Waiting for unfinished jobs.... libtool: link: libtool library `rlm_always.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_always.la] Error 1 gmake[5]: *** [rlm_always] Error 2 libtool: link: libtool library `rlm_chap.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_chap.la] Error 1 gmake[5]: *** [rlm_chap] Error 2 libtool: link: libtool library `rlm_checkval.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_checkval.la] Error 1 gmake[5]: *** [rlm_checkval] Error 2 LINK rlm_attr_filter.la rlm_attr_filter.lo libtool: link: libtool library `rlm_attr_filter.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_attr_filter.la] Error 1 gmake[5]: *** [rlm_attr_filter] Error 2 LINK rlm_wimax.la rlm_wimax.lo LINK rlm_cache.la rlm_cache.lo LINK rlm_attr_rewrite.la rlm_attr_rewrite.lo libtool: link: libtool library `rlm_attr_rewrite.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_attr_rewrite.la] Error 1 gmake[5]: *** [rlm_attr_rewrite] Error 2 libtool: link: libtool library `rlm_wimax.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_wimax.la] Error 1 gmake[5]: *** [rlm_wimax] Error 2 libtool: link: libtool library `rlm_cache.la' must begin with `lib' libtool: link: Try `libtool --help --mode=link' for more information. gmake[6]: *** [rlm_cache.la] Error 1 gmake[5]: *** [rlm_cache] Error 2 gmake[4]: *** [all] Error 2 gmake[3]: *** [modules] Error 2 gmake[2]: *** [all] Error 2 gmake[1]: *** [src] Error 2 make: *** [all] Error 2

6 10

Re: pairmake w/ regexps in master
by Alan Buxey 03 Oct '12

03 Oct '12

...this seems familiar...similar to issue I had with a regular expression I had in attrs file which I had to sort out when I migrated to 3 when the master first appeared... alan

3 2

rlm_pap code tidy
by Matthew Newton 03 Oct '12

03 Oct '12

Hi, More tidying - this time in rlm_pap. In chunks, it's at https://github.com/mcnewton/freeradius-server/commits/rlm_pap_tidy I've submitted a pull request; details for any comments below: faa17a14 - removed the 'encryption_scheme' option entirely, together with the worthless switch() at the bottom. a9d0b282 - the first update in getting rid of the spaghetti gotos. moves the crypt auth check into a separate function. patch looks messier than it is, as there's a lot of indentation changes. d71b7e3b - the main update - move each auth test into a separate small function, to drastically reduce the size of pap_authenticate() and get rid of all the gotos. (I'm not against gotos, but when they jump in and out of ifs and switch()s, it's really hard to follow the code path!) df48421a - previous introduced an few if()s inside the main attribute check loop, and returned within the loop. this tidies that up and moves that outside. also removes the reliance on RLM_MODULE_INVALID as a loop end test, which I wasn't keen on. 52b68318 - moves header-like stuff into rlm_pap.h It now uses a function pointers to select the right auth function depending on the config attribute found. I was slightly worried that calling functions on this might slow things down a bit. However, running 1000 auths in a tight loop (non-threaded server, debug off) shows essentially no difference on my system - over three runs, old code avg 23.516s, new code avg 23.464s. Cheers, Matthew -- Matthew Newton, Ph.D. <mcn4(a)le.ac.uk> Systems Architect (UNIX and Networks), Network Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp(a)le.ac.uk>

3 5

pairmake w/ regexps in master
by Phil Mayers 03 Oct '12

03 Oct '12

I think "pairmake" might not be quite right in master: https://github.com/FreeRADIUS/freeradius-server/blob/master/src/lib/valuepa… If "vp->operator" is T_OP_REG_{EQ,NE} then: 1. value is checked - if null, error 2. pairmake_xlat is called 3. this calls pairmake with value==NULL - goto 1, fail This causes problems with regexps in users files e.g. DEFAULT Attr =~ "some(.+)" ...which error out at startup with: Parse error (check) for entry blah: No regular expression found in ICzone

1 0