- Freeradius-Devel - lists.freeradius.org

GIT Log for 2010-04-30 23:33 GMT
by aland＠deployingradius.com 30 Apr '10

30 Apr '10

commit 5037647cd93b53f65645761725bea78d13407286 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Fri Apr 30 09:58:13 2010 +0200 Note Samba bug Files changed: raddb/eap.conf | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ====================================================================== commit b6fd71ae1c01e158c3ea0c14d4f41da8f493162d Author: Alan T. DeKok <aland(a)freeradius.org> Date: Fri Apr 30 07:46:30 2010 +0200 Use pairadd() properly. Files changed: .../rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c | 4 ++-- .../rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ======================================================================

1 0

Re: Freeradius-Devel Digest, Vol 60, Issue 16
by Fred MAISON 30 Apr '10

30 Apr '10

Le vendredi 30 avril 2010 à 12:00 +0200, freeradius-devel-request(a)lists.freeradius.org a écrit : > Send Freeradius-Devel mailing list submissions to > freeradius-devel(a)lists.freeradius.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.freeradius.org/mailman/listinfo/freeradius-devel > or, via email, send a message with subject or body 'help' to > freeradius-devel-request(a)lists.freeradius.org > > You can reach the person managing the list at > freeradius-devel-owner(a)lists.freeradius.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Freeradius-Devel digest..." > > > Today's Topics: > > 1. Re: cannot get core dump of crashing freeradius (Jakob Hirsch) > 2. GIT Log for 2010-04-29 23:33 GMT (aland) > 3. rlm_ldap & TCP KeepAlive (Fred MAISON) > 4. Re: rlm_ldap & TCP KeepAlive (Alan DeKok) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Thu, 29 Apr 2010 18:01:27 +0200 > From: Jakob Hirsch <jh(a)plonk.de> > Subject: Re: cannot get core dump of crashing freeradius > To: FreeRadius developers mailing list > <freeradius-devel(a)lists.freeradius.org> > Message-ID: <4BD9AD57.3010807(a)Message-ID.plonk.de> > Content-Type: text/plain; charset="iso-8859-1" > > Hi, > > follow from the users list, belongs not really there, I think. > > Alan DeKok, 2010-04-26 17:24: > >> This will become a non-issue when the prctl() calls are moved into the > >> fr_suid_* functions. :) > >> Would you like me to prepare a patch for that or would you rather do > >> that yourself? > > Patch, please. It's just easier. > > Is attached. > I found no way to enable the process's dumpable flag permanently, so I > just re-enable it on every uid/gid change. Not really elegant... > > I also propose a second (one-line) patch that allows core dumps also > when running in debug mode (as mentioned on the users list). > > Note that the patches are not really tested, will probably do that > tomorrow... >

2 1

rlm_ldap & TCP KeepAlive
by Fred MAISON 30 Apr '10

30 Apr '10

Hello, Some stateful equipments like firewall or load-balancers tends to drop long-time idle tcp session to protect their session tables. To keep idle tcp session active and avoid this kind of deconnections, I found it could be useful to be able to configure TCP KeepAlive from rlm_ldap config file, exposing TCP KeepAlive options available in Openldap libraries to rlm_ldap config file : LDAP_OPT_X_KEEPALIVE_IDLE, LDAP_OPT_X_KEEPALIVE_PROBES, LDAP_OPT_X_KEEPALIVE_INTERVAL Unfortunately, as Redhat released his 5.5, I don't have anymore access to jdennis binary repository, so I am in trouble to recompile 2.1.8 for CentOS 5.4 on x86_64. I have tried to recompile freeradius 2.1.8 with this patch from fedoraproject cvs sources, but I don't know how to integrate this patch in the source tree. Can you help ? Once validated, could this kind of code be integrated in a future release ? Best regards, Fred MAISON hg diff diff -r 9bc9e5b4d605 rlm_ldap.c --- a/rlm_ldap.c Fri Apr 30 10:18:42 2010 +0000 +++ b/rlm_ldap.c Fri Apr 30 10:32:05 2010 +0000 @@ -173,8 +173,12 @@ int edir_account_policy_check; #endif int set_auth_type; + int keepalive_idle; + int keepalive_probes; + int keepalive_interval; } ldap_instance; + /* The default setting for TLS Certificate Verification */ #define TLS_DEFAULT_VERIFY "allow" @@ -315,6 +319,9 @@ #endif {"set_auth_type", PW_TYPE_BOOLEAN, offsetof(ldap_instance,set_auth_type), NULL, "yes"}, + {"keepalive_idle", PW_TYPE_INTEGER, offsetof(ldap_instance,keepalive_idle), NULL, "60"} + {"keepalive_probes", PW_TYPE_INTEGER, offsetof(ldap_instance,keepalive_probes), NULL, "3"} + {"keepalive_interval", PW_TYPE_INTEGER, offsetof(ldap_instance,keepalive_interval), NULL, "30"} {NULL, -1, 0, NULL, NULL} }; @@ -2272,6 +2279,24 @@ radlog(L_ERR, " [%s] Could not set LDAP version to V3: %s", inst->xlat_name, ldap_err2string(ldap_errno)); } + if (ldap_set_option(ld, LDAP_OPT_X_KEEPALIVE_IDLE, + (void *) &(inst->keepalive_idle)) != LDAP_OPT_SUCCESS) { + ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ldap_errno); + radlog(L_ERR, " [%s] Could not set LDAP_OPT_X_KEEPALIVE_IDLE %d: % s", inst->xlat_name, inst->keepalive_idle, ldap_err2string(ldap_errno)); + } + if (ldap_set_option(ld, LDAP_OPT_X_KEEPALIVE_PROBES, + (void *) &(inst->keepalive_probes)) != LDAP_OPT_SUCCESS) { + ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ldap_errno); + radlog(L_ERR, " [%s] Could not set LDAP_OPT_X_KEEPALIVE_PROBES %d: % s", inst->xlat_name, inst->keepalive_probes, ldap_err2string(ldap_errno)); + } + if (ldap_set_option(ld, LDAP_OPT_X_KEEPALIVE_INTERVAL, + (void *) &(inst->keepalive_interval)) != LDAP_OPT_SUCCESS) { + ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ldap_errno); + radlog(L_ERR, " [%s] Could not set LDAP_OPT_X_KEEPALIVE_INTERVAL %d: %s", inst->xlat_name, inst->keepalive_interval, ldap_err2string(ldap_errno)); + } + + + #ifdef HAVE_LDAP_START_TLS if (inst->tls_mode) { DEBUG(" [%s] setting TLS mode to %d", inst->xlat_name, inst->tls_mode);

2 1

GIT Log for 2010-04-29 23:33 GMT
by aland＠deployingradius.com 29 Apr '10

29 Apr '10

commit 19fc3940db2e2bbd354c59303c50b230c77d7653 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Thu Apr 29 10:26:47 2010 +0200 Document more proxy functionality If the NAS doesn't retransmit, we don't either. Files changed: raddb/proxy.conf | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) ====================================================================== commit fd06854aa64fd6dbf3794f1e695a4ac613637a56 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Thu Apr 29 10:25:47 2010 +0200 More debugging messages So that the user knows when a socket is closed due to lifetime or max_queries Files changed: src/modules/rlm_sql/sql.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) ====================================================================== commit 8dbc696916652fca8e10d2c001d1a2f96187d9ab Author: Alan T. DeKok <aland(a)freeradius.org> Date: Thu Apr 29 10:25:12 2010 +0200 Removed unnecessary fflush() Files changed: src/modules/frs_dhcp/dhcp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ====================================================================== commit 8d6622aa511c9c803e3bd020a15b437723a4738a Author: Alan T. DeKok <aland(a)freeradius.org> Date: Thu Apr 29 10:16:59 2010 +0200 Ignore autoconf files Hopefully for 2.2.0, we can start getting rid of that horrible system Files changed: .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ====================================================================== commit 5b5fc292113861b65b8bb786e260fbccc7ba98af Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 28 16:52:05 2010 +0200 Add sub-options to Option 82 Files changed: share/dictionary.dhcp | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) ====================================================================== commit 97c36635617bc8330f21d2b7a7474d6ece462525 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 28 16:50:13 2010 +0200 Large code cleanups. Fix error messages (no fprintf) Enable option 82 sub-options Allow it to originate DHCP packets, too Files changed: src/modules/frs_dhcp/dhcp.c | 588 +++++++++++++++++++++++++++---------------- 1 files changed, 374 insertions(+), 214 deletions(-) ====================================================================== commit e0736545494890e825ec28fbb46c1321480a17e4 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 28 13:47:35 2010 +0200 Make dhcp_socket_t structure fall in line with listen_socket_t Files changed: src/modules/frs_dhcp/frs_dhcp.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) ====================================================================== commit 67d995975096c7fa8ece4693161ad3674f600c21 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 28 13:39:46 2010 +0200 Fixed typo Files changed: src/modules/frs_dhcp/frs_dhcp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ====================================================================== commit ed96d5b83d2f3c53fe316699450257acc7249924 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 28 11:01:14 2010 +0200 Use readline only if we have the header files Otherwise people install libreadline, and then the compile stage fails because there's no header files Files changed: src/main/radmin.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) ====================================================================== commit 46de542209627674034535ee2a8970ddb94bdd81 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Tue Apr 27 18:53:17 2010 +0200 Fix error message for people who don't understand it Files changed: src/main/modcall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ====================================================================== commit c66a88291f75dad80a73a9c47705768a3dafb869 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Tue Apr 27 11:02:54 2010 +0200 Corrected documentation Files changed: raddb/certs/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ====================================================================== commit e7118e7e2d88a07d8d7078f8a9a8daf294f9afb3 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Tue Apr 27 09:47:38 2010 +0200 Try to fix link issues, as posted to the list Files changed: src/modules/rlm_python/configure.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ====================================================================== commit 044b291410a3c6d3cc8c4e52b4a2764f6b2a47df Author: Alan T. DeKok <aland(a)freeradius.org> Date: Tue Apr 27 09:46:37 2010 +0200 Use rebind_proc only if args==3 This means that systems which have args != 3 will still build Files changed: src/modules/rlm_ldap/rlm_ldap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ====================================================================== commit 4d976d1234f0e04beda8de74247f59c66282678d Author: Alan T. DeKok <aland(a)freeradius.org> Date: Mon Apr 26 17:24:41 2010 +0200 Work around for bug #35. The packet is apparently getting freed when the request structure is still in the list. Since it's hard to tell when / why this is happening, the short-term fix is to work around it. It's better to leak memory slowly than to crash quickly. Files changed: src/lib/packet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ====================================================================== commit bf6bc8b9be4176c35b1fd4c4be69e1a2394114d6 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Mon Apr 26 19:56:54 2010 +0200 Remove from proxy hash after packet has been verified This avoids some esoteric conditions where an attacker who can monitor the RADIUS packet stream could cause the server to sometimes forget about packets that it proxied. Also cleaned up other issues related to counters (home/listener) when proxying. Files changed: src/main/event.c | 114 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 65 insertions(+), 49 deletions(-) ======================================================================

1 0

Patch to server list initialization for FreeRADIUS client lib 1.1.6
by Scott Neugroschl 28 Apr '10

28 Apr '10

DESCRIPTION: FreeRADIUS client library 1.1.6 In lib/config.c, in set_option_srv(), when the serverlist is allocated, the allocated memory currently isn't zeroed. This shouldn't be a problem, as we only search up to serv->max, but in rc_find_server(), we check to see if {acct,auth}servers->secret[i] is NULL. If we don't zero out the SERVER structure upon allocation, this value could be non-zero, and the test for NULL could fail, leading to segfault. The attached patch to lib/config.c addresses this issue by zeroing out the SERVER structure upon allocation. Scott Neugroschl

2 1

contributions to client
by Valentin Nechayev 28 Apr '10

28 Apr '10

Hi, PortaOne, Inc. uses freeradius-client in some our products. We want to pass some of our changes to upstream. Which form is preferrable for this? - post a bug for each - post a patch for each to this list (LKML style) - post a description with link ? Currently they are - add generating of Message-Authenticator (RFC3579) - switching from gethostbyname*() to getaddrinfo() (suitable for all our platforms and conforms to latter standards) - printing unknown attributes in response using special syntax to aid in issue debugging, instead of dropping the whole response - generating correct error code in case of unparseable response - allow to differ source address and NAS-IP-Address in request - multiple servers in config file - remove endian check and macros as unused and conflicting - misc. fixes on compiler warnings -- Valentin Nechayev PortaOne Inc., Software Engineer mailto:netch@portaone.com

2 1

GIT Log for 2010-04-26 23:33 GMT
by aland＠deployingradius.com 26 Apr '10

26 Apr '10

commit 5aa70cd8e671ca98bb1cf52a1b0b3e38b6a35dff Author: Alan T. DeKok <aland(a)freeradius.org> Date: Mon Apr 26 15:38:30 2010 +0200 Added prototype Files changed: src/main/event.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ====================================================================== commit ca96fbe57257400f1e7f47ad64cb14448bd6a670 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Mon Apr 26 15:32:29 2010 +0200 More WITH_PROXY fixes Files changed: src/modules/rlm_eap/rlm_eap.c | 15 +++++++++++++-- .../types/rlm_eap_mschapv2/rlm_eap_mschapv2.c | 10 ++++++++-- .../rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c | 8 ++++++++ src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h | 2 +- .../rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c | 12 +++++++----- 5 files changed, 37 insertions(+), 10 deletions(-) ====================================================================== commit 24d3a3c54c0277a283e689e4fc1d1fd9e02d9889 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 21 08:57:29 2010 +0200 Attributes for "cisco vsa hack" don't need to be string Files changed: src/modules/rlm_preprocess/rlm_preprocess.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ====================================================================== commit cfe6ab830f32459e4bdd507a5376c941a6677d96 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 21 08:56:54 2010 +0200 Better error messages for missing brace Files changed: src/main/conffile.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ====================================================================== commit d21f476971324e2a927fcac1146fe643ba8ec11c Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 21 08:55:00 2010 +0200 Allow to build without pthreads Files changed: src/main/event.c | 72 +++++++++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 36 deletions(-) ====================================================================== commit c25ec429a06f91d1191f5c88f42952dcf79a6da5 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Mon Apr 26 15:57:40 2010 +0200 Fix build error Files changed: src/main/event.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ====================================================================== commit a79b7274f59943702f846f811dc062dda72fbf68 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 21 08:52:56 2010 +0200 Print out helpful error if a realm regex can't be parsed Files changed: src/main/realms.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) ====================================================================== commit 505598df79a090e334ed82d7efce96825787fefc Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 21 08:52:21 2010 +0200 Prefer IPv4. Files changed: src/main/radclient.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ====================================================================== commit 1eebb2ab3c7a755a18321b25a04c68b462dbe008 Author: Alan T. DeKok <aland(a)freeradius.org> Date: Wed Apr 21 08:51:58 2010 +0200 Added WITH_PROXY to allow it to build without proxying Files changed: src/main/modules.c | 2 ++ src/main/util.c | 2 ++ src/modules/rlm_eap/types/rlm_eap_peap/peap.c | 21 +++++++++++++++++---- src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c | 14 +++++++++----- 4 files changed, 30 insertions(+), 9 deletions(-) ======================================================================

1 0

rlm_ldap ignores password_radius_attribute
by Alexander Clouter 26 Apr '10

26 Apr '10

Hi, Looks like the rlm_ldap module ignores 'password_radius_attribute'[1] so something like the following completely untested patch is needed. The Novhell eDirectory code probably needs tweaking also to honour this variable, or alternatively remove 'password_radius_attribute' altogether and make: ---- int attr = PW_CLEARTEXT_PASSWORD; ---- Something needs to be done, otherwise there is no way to deal with: ---- ldap_local] performing user authorization for 0021040f7c04 [ldap_local] expand: (&(objectClass=ieee802Device)(cn=%{Stripped-User-Name})) -> (&(objectClass=ieee802Device)(cn=0021040f7c04)) [ldap_local] expand: ou=comms,o=soas -> ou=comms,o=soas [ldap_local] ldap_get_conn: Checking Id: 0 [ldap_local] ldap_get_conn: Got Id: 0 [ldap_local] performing search in ou=comms,o=soas, with filter (&(objectClass=ieee802Device)(cn=0021040f7c04)) [ldap_local] Added User-Password = <AHEM> in check items [ldap_local] No default NMAS login sequence [ldap_local] looking for check items in directory... [ldap_local] looking for reply items in directory... [ldap_local] user 0021040f7c04 authorized to use remote access [ldap_local] ldap_release_conn: Release Id: 0 +++[ldap_local] returns ok ++- if (Stripped-User-Name =~ /^[0-9a-f]{12}$/) returns ok ++ ... skipping else for request 2048: Preceding "if" was taken Found Auth-Type = digest !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!! Replacing User-Password in config items with Cleartext-Password. !!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!! Please update your configuration so that the "known good" !!! !!! clear text password is in Cleartext-Password, and not in User-Password. !!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +- entering group authenticate {...} [digest] rlm_digest: Converting Digest-Attributes to something sane... Digest-User-Name = "0021040f7c04" Digest-Realm = "soas.ac.uk" Digest-Nonce = <AHEM> Digest-URI = "sip:soas.ac.uk" Digest-Method = "REGISTER" ---- Cheers [1] http://wiki.freeradius.org/Rlm_ldap diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index 133bcb6..0155aa4 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -148,6 +148,7 @@ typedef struct { char *access_attr; char *passwd_hdr; char *passwd_attr; + char *passwd_rad_attr; int auto_header; char *dictionary_mapping; char *groupname_attr; @@ -263,6 +264,8 @@ static const CONF_PARSER module_config[] = { offsetof(ldap_instance,passwd_hdr), NULL, NULL}, {"password_attribute", PW_TYPE_STRING_PTR, offsetof(ldap_instance,passwd_attr), NULL, NULL}, + {"password_radius_attribute", PW_TYPE_STRING_PTR, + offsetof(ldap_instance,passwd_rad_attr), NULL, NULL}, {"auto_header", PW_TYPE_BOOLEAN, offsetof(ldap_instance,auto_header), NULL, "no"}, @@ -1497,7 +1500,9 @@ static int ldap_authorize(void *instance, REQUEST * request) if (passwd_vals) for (i = 0; passwd_vals[i] != NULL; i++) { - int attr = PW_USER_PASSWORD; + int attr = (inst->passwd_rad_attr) + ? dict_attrbyname(inst->passwd_rad_attr) + : PW_USER_PASSWORD; /* should this not default to now PW_CLEARTEXT_PASSWORD */ if (strlen(passwd_vals[i]) == 0) continue;

3 3

Patch to allow FreeRADIUS server 2.1.8 to compile on non-GCC systems
by Scott Neugroschl 21 Apr '10

21 Apr '10

Change Description: * Allow code to compile on non-GCC systems, by providing const casting when necessary (command.c, for example) * Allow code to compile on non-GCC systems, by fixing variable declarations that are not at the beginning of a block (ltdl.c, for example) diff -urN freeradius-server-2.1.8/libltdl/ltdl.c freeradiusd-gnucleanup/libltdl/ltdl.c --- freeradius-server-2.1.8/libltdl/ltdl.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/libltdl/ltdl.c 2010-04-20 07:25:27.000000000 -0700 @@ -2442,12 +2442,14 @@ while (loader) { + lt_user_data data; /* san */ if (useloader && strcmp(loader->loader_name, useloader)) { loader = loader->next; continue; } - lt_user_data data = loader->dlloader_data; +/* lt_user_data data = loader->dlloader_data; */ /* SAN */ + data = loader->dlloader_data; /* SAN */ cur->module = loader->module_open (data, filename); diff -urN freeradius-server-2.1.8/src/main/auth.c freeradiusd-gnucleanup/src/main/auth.c --- freeradius-server-2.1.8/src/main/auth.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/main/auth.c 2010-04-20 09:28:18.000000000 -0700 @@ -175,9 +175,13 @@ */ cur_config_item = request->config_items; while(((auth_type_pair = pairfind(cur_config_item, PW_AUTH_TYPE))) != NULL) { + DICT_VALUE *dv = NULL; /* SAN */ auth_type = auth_type_pair->vp_integer; auth_type_count++; - DICT_VALUE *dv = dict_valbyattr(auth_type_pair->attribute, +/* SAN DICT_VALUE *dv = dict_valbyattr(auth_type_pair->attribute, + auth_type_pair->vp_integer); +*/ + dv = dict_valbyattr(auth_type_pair->attribute, auth_type_pair->vp_integer); RDEBUG2("Found Auth-Type = %s", diff -urN freeradius-server-2.1.8/src/main/command.c freeradiusd-gnucleanup/src/main/command.c --- freeradius-server-2.1.8/src/main/command.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/main/command.c 2010-04-20 09:33:16.000000000 -0700 @@ -842,7 +842,7 @@ return 0; } - cf_section2file(fp, client->cs); + cf_section2file(fp, /* SAN */(CONF_SECTION*)client->cs); fclose(fp); return 1; diff -urN freeradius-server-2.1.8/src/main/listen.c freeradiusd-gnucleanup/src/main/listen.c --- freeradius-server-2.1.8/src/main/listen.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/main/listen.c 2010-04-20 09:33:05.000000000 -0700 @@ -126,7 +126,7 @@ last_printed = now; } - listener->print(listener, name, sizeof(name)); + listener->print(/* SAN */(rad_listen_t*)listener, name, sizeof(name)); radlog(L_ERR, "Ignoring request to %s from unknown client %s port %d", name, inet_ntop(ipaddr->af, &ipaddr->ipaddr, @@ -206,7 +206,7 @@ request = request_alloc(); if (!request) goto unknown; - request->listener = listener; + request->listener = /* SAN */(rad_listen_t*)listener; request->client = client; request->packet = rad_recv(listener->fd, 0x02); /* MSG_PEEK */ if (!request->packet) { /* badly formed, etc */ diff -urN freeradius-server-2.1.8/src/main/log.c freeradiusd-gnucleanup/src/main/log.c --- freeradius-server-2.1.8/src/main/log.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/main/log.c 2010-04-20 09:35:58.000000000 -0700 @@ -384,7 +384,7 @@ s[1] = '\0'; } - s = fr_int2str(levels, (lvl & ~L_CONS), ": "); + s = /* SAN */ (char *) fr_int2str(levels, (lvl & ~L_CONS), ": "); strcat(buffer, s); len = strlen(buffer); diff -urN freeradius-server-2.1.8/src/main/xlat.c freeradiusd-gnucleanup/src/main/xlat.c --- freeradius-server-2.1.8/src/main/xlat.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/main/xlat.c 2010-04-20 09:49:52.000000000 -0700 @@ -572,7 +572,7 @@ * Register the internal packet xlat's. */ for (i = 0; internal_xlat[i] != NULL; i++) { - xlat_register(internal_xlat[i], xlat_packet, &xlat_inst[i]); + xlat_register(internal_xlat[i], xlat_packet, /* SAN */(void*)&xlat_inst[i]); c = xlat_find(internal_xlat[i]); rad_assert(c != NULL); c->internal = TRUE; @@ -581,7 +581,7 @@ /* * New name: "control" */ - xlat_register("control", xlat_packet, &xlat_inst[0]); + xlat_register("control", xlat_packet, /* SAN */(void*)&xlat_inst[0]); c = xlat_find("control"); rad_assert(c != NULL); c->internal = TRUE; @@ -593,7 +593,7 @@ buffer[1] = '\0'; for (i = 0; i <= REQUEST_MAX_REGEX; i++) { buffer[0] = '0' + i; - xlat_register(buffer, xlat_regex, &xlat_inst[i]); + xlat_register(buffer, xlat_regex, /* SAN */(void*)&xlat_inst[i]); c = xlat_find(buffer); rad_assert(c != NULL); c->internal = TRUE; @@ -601,12 +601,12 @@ #endif /* HAVE_REGEX_H */ - xlat_register("debug", xlat_debug, &xlat_inst[0]); + xlat_register("debug", xlat_debug, /* SAN */(void*)&xlat_inst[0]); c = xlat_find("debug"); rad_assert(c != NULL); c->internal = TRUE; - xlat_register("md5", xlat_md5, &xlat_inst[0]); + xlat_register("md5", xlat_md5, /* SAN */(void*)&xlat_inst[0]); c = xlat_find("md5"); rad_assert(c != NULL); c->internal = TRUE; diff -urN freeradius-server-2.1.8/src/modules/rlm_dbm/rlm_dbm.c freeradiusd-gnucleanup/src/modules/rlm_dbm/rlm_dbm.c --- freeradius-server-2.1.8/src/modules/rlm_dbm/rlm_dbm.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/modules/rlm_dbm/rlm_dbm.c 2010-04-20 07:43:17.000000000 -0700 @@ -206,7 +206,7 @@ if ( parse_state == SMP_PATTERN ) { /* pattern line found */ DEBUG2("process pattern"); /* check pattern against request */ - if ( paircompare(req, request, vp, reply ) == 0 ) { + if ( paircompare(req, /* SAN */ (VALUE_PAIR*)request, vp, reply ) == 0 ) { DEBUG2("rlm_dbm: Pattern matched, look for request"); pairmove(&tmp_config, &vp); pairfree(&vp); diff -urN freeradius-server-2.1.8/src/modules/rlm_policy/parse.c freeradiusd-gnucleanup/src/modules/rlm_policy/parse.c --- freeradius-server-2.1.8/src/modules/rlm_policy/parse.c 2009-12-30 07:44:35.000000000 -0800 +++ freeradiusd-gnucleanup/src/modules/rlm_policy/parse.c 2010-04-20 09:24:14.000000000 -0700 @@ -1532,7 +1532,7 @@ } if ((lexer->debug & POLICY_DEBUG_PRINT_POLICY) != 0) { - rlm_policy_print(this); + rlm_policy_print(/* SAN */(policy_item_t*)this); } return 1;

3 5

A Question on patch posting etiquette
by Scott Neugroschl 21 Apr '10

21 Apr '10

To avoid yet another submission of the gcc-ism fixes, and to have proper netiquette, I've got a question. Should patches be inlined (per doc/DIFFS) or submitted as attachments, as I've seen other people do here? Thank you, Scott Neugroschl

2 1