OBS User unknown 2008-07-24 20:17:53 +00:00 committed by Git OBS Bridge
parent dae4c65932
commit 58a8e190d7
10 changed files with 159 additions and 81 deletions

View File

@ -1,47 +0,0 @@
--- src/lib/event.c
+++ src/lib/event.c
@@ -85,8 +85,14 @@
void fr_event_list_free(fr_event_list_t *el)
{
+ fr_event_t *ev;
+
if (!el) return;
+ while ((ev = fr_heap_peek(el->times)) != NULL) {
+ fr_event_delete(el, &ev);
+ }
+
fr_heap_delete(el->times);
free(el);
}
@@ -137,6 +143,7 @@
*ev_p = NULL;
fr_heap_extract(el->times, ev);
+ free(ev);
return 1;
}
--- src/lib/fifo.c
+++ src/lib/fifo.c
@@ -127,7 +127,7 @@
{
entry->data = NULL;
entry->next = fi->freelist;
- fi->freelist = entry->next;
+ fi->freelist = entry;
}
--- src/main/threads.c
+++ src/main/threads.c
@@ -365,6 +365,8 @@
entry = fr_fifo_pop(thread_pool.fifo[i]);
rad_assert(entry != NULL);
entry->request->child_state = REQUEST_DONE;
+ thread_pool.num_queued--;
+ free(entry);
}
start = 0;

View File

@ -1,11 +0,0 @@
--- raddb/Makefile
+++ raddb/Makefile
@@ -15,6 +15,8 @@
policy.txt preproxy_users proxy.conf radiusd.conf \
snmp.conf sql.conf sqlippool.conf users policy.conf \
sites-available/default sites-available/example \
+ sites-available/buffered-sql sites-available/copy-acct-to-home-server \
+ sites-available/inner-tunnel sites-available/proxy-inner-tunnel sites-available/vmps \
sites-available/README
#

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3184e9be6d88df3cdf72a08a7e00222c17bc360289ecf14219df9c81d68d7f79
size 2298963

View File

@ -54,14 +54,3 @@
#ifdef HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif
--- src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c
+++ src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c
@@ -63,7 +63,7 @@
snprintf(buffer, sizeof(buffer), "%s/sqlite_radius_client_database",
radius_dir);
radlog(L_INFO, "rlm_sql_sqlite: Opening sqlite database %s for #%d",
- sqlsocket->id);
+ buffer, sqlsocket->id);
status = sqlite3_open(buffer, &sqlite_sock->pDb);
radlog(L_INFO, "rlm_sql_sqlite: sqlite3_open() = %d\n", status);

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9eab7d8bfa89196a28ed65a76f647edd5e666dd9edc6e29384381d72139ed6e2
size 2323968

View File

@ -1,3 +1,80 @@
-------------------------------------------------------------------
Wed Jul 23 11:06:13 CEST 2008 - prusnak@suse.cz
- updated to 2.0.5
Feature improvements
* Permit SQL authorize_reply_query to be empty.
* Allow setting response packet type in Post-Proxy-Type Fail
handler.
* Added install-chown target to set correct permission and ownership
make RADMIN=radmin RGROUP=radius install-chown
* Support for LDAP-Group and other dynamic comparison attributes
in unlang. Developed from a patch by Jason Alderfer.
* Added chroot support. See radiusd.conf for comments.
* Allow clients of 0/0. We do not recommend using this, though.
* Moved many module configurations into raddb/modules/*
Bug fixes
* Allow proxying to virtual servers for accounting packets, too.
* Added "num fields" function to PostgreSQL client.
* Updated proxy fallback mechanism to validate fallback servers,
and to process fallback requests in a child thread.
* rlm_realm returns "ok" for LOCAL realms, not "noop".
* Fixed some DHCP code handling. The examples should now work.
- updated to 2.0.4
Feature improvements
* Allow "virtual_server" in "realm" and "home_server" sections.
See raddb/proxy.conf and raddb/sites-available/virtual.example.com.
* Allow "passwd" module to be listed in "accounting" and "post-auth".
* Added "fallback" to "home_server_pool" configuration, to handle
the case of all home servers being dead. See raddb/proxy.conf.
* Added sample text to raddb/sites-available/inner-tunnel which
can simplify debugging of inner tunnel configurations.
* Added regular expression matching in realm names. See
raddb/proxy.conf for examples.
* Added simple DHCP server functionality. For comments, see
raddb/sites-available/dhcp.
* Added file globbing capabilities to detail file reader
* Added sample raddb/sites-available/robust-proxy-accounting
* Clients in SQL can now refer to a virtual server.
Patch from Michael Bretterklieber.
* Added some examples of creating RADIUS administrator in SQL,
and assigning appropriate access rights.
Bug fixes
* Install all files in raddb/sites-available
* Allow non-threaded builds.
* Don't treat '0x' as special for known attributes that are not
of type "octets".
* Fix log error in rlm_pap.
* Remove documentation about non-existent functionality.
* Updated warning messages in debug output.
* Fix handling of timeouts in rlm_ldap that affected 64-bit systems.
This fix was supposed to go into 2.0.3, but did not make it.
* Fix event handling in debug mode for failed proxy requests.
* Fix memleak in fifos. Closes #537.
* Fix memleak on blocked threads. Closes #538.
* Perform additional checks on NULL realms. Closes #541.
* Fix handling of "clients" in "listen" section.
* When detail file cannot process a packet, sleep for longer
to let the rest of the server do something.
* Add missing table to raddb/sql/mssql/schema.sql. Closes #545.
* Updated rlm_sql_postgresql to build with PostgreSQL 7.x.
Closes #533.
* Fix "postauth" of rlm_ldap to look for LDAP-UserDn in the
correct place.
* Update rlm_attr_filter for some corner cases. Closes #543.
* Fixed memory leak in libfreeradius event handler.
* In the SQL Accounting on/off queries, remove the restriction
that the session time had to be zero.
- dropped obsoleted patches
* event-fifo-threads.patch (included in update)
* raddb.patch (no longer needed)
- added logrotate to Recommends
-------------------------------------------------------------------
Tue May 13 18:25:19 CEST 2008 - prusnak@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package freeradius-server (Version 2.0.3)
# spec file for package freeradius-server (Version 2.0.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -11,8 +11,8 @@
Name: freeradius-server
Version: 2.0.3
Release: 20
Version: 2.0.5
Release: 1
License: GPL v2 only; LGPL v2.1 only
Group: Productivity/Networking/Radius/Servers
Provides: radiusd
@ -25,9 +25,7 @@ Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-ltdl.patch
Patch1: %{name}-%{version}-dialup_admin.patch
Patch2: %{name}-%{version}-rcradiusd.patch
Patch3: %{name}-%{version}-raddb.patch
Patch4: %{name}-%{version}-codecleanup.patch
Patch5: %{name}-%{version}-event-fifo-threads.patch
Patch3: %{name}-%{version}-codecleanup.patch
PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd
PreReq: perl
PreReq: %insserv_prereq %fillup_prereq
@ -37,6 +35,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR)
Requires: %{name}-libs = %{version}
Requires: python perl
Recommends: logrotate
BuildRequires: db-devel e2fsprogs-devel gcc-c++ gdbm-devel gettext-devel glibc-devel libtool ncurses-devel
BuildRequires: libpcap-devel net-snmp-devel openldap2-devel openssl-devel pam-devel perl postgresql-devel
BuildRequires: python-devel sed sqlite3-devel unixODBC-devel zlib-devel
@ -203,8 +202,6 @@ Authors:
%patch1
%patch2
%patch3
%patch4
%patch5
%build
#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fstack-protector"
@ -223,6 +220,7 @@ export LDFLAGS="-pie"
--with-system-libtool \
--with-udpfromto \
--without-rlm_eap_ikev2 \
--without-rlm_eap_tnc \
--with-rlm-krb5-lib-dir=%{_libdir} \
--without-rlm_opendirectory \
--without-rlm_sql_db2 \
@ -335,6 +333,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/radiusd.conf
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/snmp.conf
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sql.conf
%dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/modules
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/modules/*
%dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/sql
%dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/sql/mssql
%dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/sql/mysql
@ -342,6 +342,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/sql/postgresql
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sql/*/*.conf
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sql/*/*.sql
%{_sysconfdir}/raddb/sql/*/*.txt
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/users
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/experimental.conf
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/otp.conf
@ -364,7 +365,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(700,radiusd,radiusd) %dir %{_localstatedir}/run/radiusd/
# binaries
%defattr(-,root,root)
%{_sbindir}/check-radiusd-config
# %{_sbindir}/check-radiusd-config
%{_sbindir}/checkrad
%{_sbindir}/radiusd
%{_sbindir}/radrelay
@ -424,6 +425,75 @@ rm -rf $RPM_BUILD_ROOT
%attr(644,root,root) %{_includedir}/freeradius/*.h
%changelog
* Wed Jul 23 2008 prusnak@suse.cz
- updated to 2.0.5
Feature improvements
* Permit SQL authorize_reply_query to be empty.
* Allow setting response packet type in Post-Proxy-Type Fail
handler.
* Added install-chown target to set correct permission and ownership
make RADMIN=radmin RGROUP=radius install-chown
* Support for LDAP-Group and other dynamic comparison attributes
in unlang. Developed from a patch by Jason Alderfer.
* Added chroot support. See radiusd.conf for comments.
* Allow clients of 0/0. We do not recommend using this, though.
* Moved many module configurations into raddb/modules/*
Bug fixes
* Allow proxying to virtual servers for accounting packets, too.
* Added "num fields" function to PostgreSQL client.
* Updated proxy fallback mechanism to validate fallback servers,
and to process fallback requests in a child thread.
* rlm_realm returns "ok" for LOCAL realms, not "noop".
* Fixed some DHCP code handling. The examples should now work.
- updated to 2.0.4
Feature improvements
* Allow "virtual_server" in "realm" and "home_server" sections.
See raddb/proxy.conf and raddb/sites-available/virtual.example.com.
* Allow "passwd" module to be listed in "accounting" and "post-auth".
* Added "fallback" to "home_server_pool" configuration, to handle
the case of all home servers being dead. See raddb/proxy.conf.
* Added sample text to raddb/sites-available/inner-tunnel which
can simplify debugging of inner tunnel configurations.
* Added regular expression matching in realm names. See
raddb/proxy.conf for examples.
* Added simple DHCP server functionality. For comments, see
raddb/sites-available/dhcp.
* Added file globbing capabilities to detail file reader
* Added sample raddb/sites-available/robust-proxy-accounting
* Clients in SQL can now refer to a virtual server.
Patch from Michael Bretterklieber.
* Added some examples of creating RADIUS administrator in SQL,
and assigning appropriate access rights.
Bug fixes
* Install all files in raddb/sites-available
* Allow non-threaded builds.
* Don't treat '0x' as special for known attributes that are not
of type "octets".
* Fix log error in rlm_pap.
* Remove documentation about non-existent functionality.
* Updated warning messages in debug output.
* Fix handling of timeouts in rlm_ldap that affected 64-bit systems.
This fix was supposed to go into 2.0.3, but did not make it.
* Fix event handling in debug mode for failed proxy requests.
* Fix memleak in fifos. Closes #537.
* Fix memleak on blocked threads. Closes #538.
* Perform additional checks on NULL realms. Closes #541.
* Fix handling of "clients" in "listen" section.
* When detail file cannot process a packet, sleep for longer
to let the rest of the server do something.
* Add missing table to raddb/sql/mssql/schema.sql. Closes #545.
* Updated rlm_sql_postgresql to build with PostgreSQL 7.x.
Closes #533.
* Fix "postauth" of rlm_ldap to look for LDAP-UserDn in the
correct place.
* Update rlm_attr_filter for some corner cases. Closes #543.
* Fixed memory leak in libfreeradius event handler.
* In the SQL Accounting on/off queries, remove the restriction
that the session time had to be zero.
- dropped obsoleted patches
* event-fifo-threads.patch (included in update)
* raddb.patch (no longer needed)
- added logrotate to Recommends
* Tue May 13 2008 prusnak@suse.cz
- fix crashes in events, fifo and threads (event-fifo-threads.patch)
* Mon May 05 2008 pth@suse.de