Hello community, here is the log from the commit of package freeradius checked in at Tue Nov 6 22:21:27 CET 2007. -------- --- freeradius/freeradius.changes 2007-05-03 13:55:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/freeradius/freeradius.changes 2007-11-06 13:17:47.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Nov 6 13:16:58 CET 2007 - prusnak@suse.cz + +- updated to 1.1.7 + Feature Improvements + * Updated LDAP documentation. + * Added note on DH parameters in eap.conf, and debugging messages + which complain if DH is used, but not configured properly. + * Updated the Mikrotik dictionary. Added a note that the sample + dictionary they supply is broken. + * Output more information on blocked threads, which should help + narrow down which modules is causing the problem. + * Added more eDirectory support. + * rlm_ldap now prints out attributes in the standard format + * Enabled server-side handling of procedures in MySQL + Bug Fixes + * Added NT-Hash support for mschap_xlat. + * Corrected documentation to point to correct location of files. + * Checks for more recent FreeBSD versions. + * uses -DLDAP_DEPRECATED to avoid OpenLDAP crashes. + * Use correct value for authentication name in rlm_mschap. + * Fix over-ride for usernames when use_tunneled_reply = yes. + +------------------------------------------------------------------- Old: ---- dialup_admin.patch freeradius-1.1.6.tar.bz2 freeradius-fix_type_punning.patch ltdl.patch New: ---- freeradius-1.1.7-dialup_admin.patch freeradius-1.1.7-ltdl.patch freeradius-1.1.7.tar.bz2 freeradius-1.1.7-type_punning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeradius.spec ++++++ --- /var/tmp/diff_new_pack.N22568/_old 2007-11-06 22:18:47.000000000 +0100 +++ /var/tmp/diff_new_pack.N22568/_new 2007-11-06 22:18:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package freeradius (Version 1.1.6) +# spec file for package freeradius (Version 1.1.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,13 +11,13 @@ Name: freeradius BuildRequires: apache2-devel db-devel gdbm-devel krb5-devel libapr-util1-devel mysql-devel openldap2 openldap2-devel pam-devel pcre-devel postgresql-devel python-devel unixODBC-devel -License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Networking/Radius/Servers Provides: radiusd Conflicts: radiusd-livingston radiusd-cistron icradius -Version: 1.1.6 +Version: 1.1.7 Release: 1 -URL: http://www.freeradius.org/ +Url: http://www.freeradius.org/ Summary: Very Highly Configurable Radius Server Source0: %{name}-%{version}.tar.bz2 Source1: rcradiusd @@ -25,16 +25,14 @@ Source3: radqkstart.pdf Source4: radadmin.pdf Source5: admin-httpd.conf -Patch0: ltdl.patch -Patch1: dialup_admin.patch -Patch2: freeradius-fix_type_punning.patch -%if %suse_version > 800 -PreReq: /usr/sbin/useradd /usr/sbin/groupadd +Patch0: %{name}-%{version}-ltdl.patch +Patch1: %{name}-%{version}-dialup_admin.patch +Patch2: %{name}-%{version}-type_punning.patch +PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd PreReq: %insserv_prereq %fillup_prereq -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apxs2 apxs2-prefork -%define apache2_sysconfdir %(/usr/sbin/%{apxs2} -q SYSCONFDIR) +%define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR) %description The FreeRADIUS server has a number of features found in other servers @@ -104,40 +102,26 @@ %patch0 %patch1 %patch2 -rm -rf `find . -name CVS` mkdir novell cp -f %{SOURCE3} %{SOURCE4} novell/ %build #export CFLAGS="%{optflags} -fno-strict-aliasing -DLDAP_DEPRECATED" -export CFLAGS="%{optflags} -DLDAP_DEPRECATED" +export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" %ifarch x86_64 ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fPIC" %endif -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" %endif -%if %suse_version < 920 -ln -sf %{_libdir}/libmysqlclient_r.so.12 %{_libdir}/libmysqlclient_r.so -ln -sf %{_libdir}/libmysqlclient_r.so.12 %{_libdir}/mysql/libmysqlclient_r.so -%endif -./configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --infodir=%{_infodir} \ - --mandir=%{_mandir} \ - --localstatedir=/var \ - --libdir=/usr/lib/freeradius \ +%configure \ + --libdir=%{_libdir}/freeradius \ --with-threads \ --with-snmp \ --with-large-files \ --with-udpfromto \ --disable-ltdl-install \ --with-gnu-ld \ -%if %suse_version <= 920 - --enable-heimdal-krb5 \ - --with-rlm-krb5-include-dir=/usr/include/heimdal/ \ -%endif --with-rlm-krb5-lib-dir=%{_libdir} \ --enable-strict-dependencies \ --with-edir @@ -145,27 +129,23 @@ make %install -mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/radiusd make install R=$RPM_BUILD_ROOT INSTALLSTRIP= # modify default configuration RADDB=$RPM_BUILD_ROOT%{_sysconfdir}/raddb perl -i -pe 's/^#user =.*$/user = radiusd/' $RADDB/radiusd.conf perl -i -pe 's/^#group =.*$/group = radiusd/' $RADDB/radiusd.conf -/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/lib/freeradius +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/freeradius # logs -touch $RPM_BUILD_ROOT/var/log/radius/radutmp +touch $RPM_BUILD_ROOT%{_localstatedir}/log/radius/radutmp # SuSE -install -d $RPM_BUILD_ROOT/etc/pam.d -install -d $RPM_BUILD_ROOT/etc/logrotate.d -%if %suse_version > 920 -install -m 644 suse/radiusd-pam $RPM_BUILD_ROOT/etc/pam.d/radiusd -%else -install -m 644 suse/radiusd-pam-old $RPM_BUILD_ROOT/etc/pam.d/radiusd -%endif -install -m 644 suse/radiusd-logrotate $RPM_BUILD_ROOT/etc/logrotate.d/radiusd -install -d -m 755 $RPM_BUILD_ROOT/etc/init.d -install -m 744 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/radiusd -ln -sf ../../etc/init.d/radiusd $RPM_BUILD_ROOT/usr/sbin/rcradiusd +install -d $RPM_BUILD_ROOT%{_sysconfdir}/pam.d +install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -m 644 suse/radiusd-pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/radiusd +install -m 644 suse/radiusd-logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/radiusd +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d +install -m 744 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/radiusd +ln -sf ../..%{_sysconfdir}/init.d/radiusd $RPM_BUILD_ROOT%{_sbindir}/rcradiusd mv -v doc/README doc/README.doc # install dialup_admin mkdir -p $RPM_BUILD_ROOT%{_datadir}/dialup_admin @@ -175,28 +155,24 @@ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{apache2_sysconfdir}/conf.d/radius.conf # remove unneeded stuff rm -rf doc/00-OLD -rm -f $RPM_BUILD_ROOT/etc/raddb/experimental.conf $RPM_BUILD_ROOT/usr/sbin/radwatch $RPM_BUILD_ROOT/usr/sbin/rc.radiusd -rm -rf $RPM_BUILD_ROOT/usr/share/doc/freeradius* -rm -rf $RPM_BUILD_ROOT/usr/lib/freeradius/*.la +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/raddb/experimental.conf $RPM_BUILD_ROOT%{_sbindir}/radwatch $RPM_BUILD_ROOT%{_sbindir}/rc.radiusd +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/freeradius* +rm -rf $RPM_BUILD_ROOT%{_libdir}/freeradius/*.la %pre -/usr/sbin/groupadd -r radiusd 2> /dev/null || : -/usr/sbin/useradd -r -g radiusd -s /bin/false -c "Radius daemon" -d \ - /var/lib/radiusd radiusd 2> /dev/null || : +%{_sbindir}/groupadd -r radiusd 2> /dev/null || : +%{_sbindir}/useradd -r -g radiusd -s /bin/false -c "Radius daemon" -d \ + %{_localstatedir}/lib/radiusd radiusd 2> /dev/null || : %post %{fillup_and_insserv -s radiusd START_RADIUSD } -%if %suse_version > 820 %preun %stop_on_removal radiusd -%endif %postun -%if %suse_version > 820 %restart_on_update radiusd -%endif -%{insserv_cleanup} +%insserv_cleanup %clean rm -rf $RPM_BUILD_ROOT @@ -215,7 +191,7 @@ %config %{_sysconfdir}/pam.d/radiusd %config %{_sysconfdir}/logrotate.d/radiusd %{_sbindir}/rcradiusd -%dir %attr(755,radiusd,radiusd) /var/lib/radiusd +%dir %attr(755,radiusd,radiusd) %{_localstatedir}/lib/radiusd # configs %dir %{_sysconfdir}/raddb %defattr(-,root,radiusd) @@ -238,6 +214,7 @@ %ghost %config(noreplace) %{_sysconfdir}/raddb/realms %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/snmp.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sql.conf +%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/postgresqlippool.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sqlippool.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/users %config(noreplace) %{_sysconfdir}/raddb/otp.conf @@ -246,7 +223,7 @@ %config(noreplace) %{_sysconfdir}/raddb/certs/ %config(noreplace) %{_sysconfdir}/raddb/eap.conf %{_sysconfdir}/raddb/example.pl -%attr(700,radiusd,radiusd) %dir /var/run/radiusd/ +%attr(700,radiusd,radiusd) %dir %{_localstatedir}/run/radiusd/ # binaries %defattr(-,root,root) %{_bindir}/* @@ -254,66 +231,67 @@ %{_sbindir}/checkrad %{_sbindir}/radiusd # shared libs -%attr(755,root,root) %dir /usr/lib/freeradius -#%attr(755,root,root) %{_prefix}/lib/freeradius/*.so* -%{_prefix}/lib/freeradius/libeap*.so -%{_prefix}/lib/freeradius/libradius*.so -%{_prefix}/lib/freeradius/rlm_acct_unique*.so -%{_prefix}/lib/freeradius/rlm_always*.so -%{_prefix}/lib/freeradius/rlm_attr_filter*.so -%{_prefix}/lib/freeradius/rlm_attr_rewrite*.so -%{_prefix}/lib/freeradius/rlm_chap*.so -%{_prefix}/lib/freeradius/rlm_checkval*.so -%{_prefix}/lib/freeradius/rlm_counter*.so -%{_prefix}/lib/freeradius/rlm_dbm*.so -%{_prefix}/lib/freeradius/rlm_detail*.so -%{_prefix}/lib/freeradius/rlm_digest*.so -%{_prefix}/lib/freeradius/rlm_eap-*.so -%{_prefix}/lib/freeradius/rlm_eap.so -%{_prefix}/lib/freeradius/rlm_eap_gtc*.so -%{_prefix}/lib/freeradius/rlm_eap_leap*.so -%{_prefix}/lib/freeradius/rlm_eap_md5*.so -%{_prefix}/lib/freeradius/rlm_eap_mschapv2*.so -%{_prefix}/lib/freeradius/rlm_eap_peap*.so -%{_prefix}/lib/freeradius/rlm_eap_sim*.so -%{_prefix}/lib/freeradius/rlm_eap_tls*.so -%{_prefix}/lib/freeradius/rlm_eap_ttls*.so -%{_prefix}/lib/freeradius/rlm_exec*.so -%{_prefix}/lib/freeradius/rlm_expr*.so -%{_prefix}/lib/freeradius/rlm_fastusers*.so -%{_prefix}/lib/freeradius/rlm_files*.so -%{_prefix}/lib/freeradius/rlm_ippool*.so -%{_prefix}/lib/freeradius/rlm_krb5*.so -%{_prefix}/lib/freeradius/rlm_ldap*.so -%{_prefix}/lib/freeradius/rlm_mschap*.so -%{_prefix}/lib/freeradius/rlm_ns_mta_md5*.so -%{_prefix}/lib/freeradius/rlm_pam*.so -%{_prefix}/lib/freeradius/rlm_pap*.so -%{_prefix}/lib/freeradius/rlm_passwd*.so -%{_prefix}/lib/freeradius/rlm_perl*.so -%{_prefix}/lib/freeradius/rlm_preprocess*.so -%{_prefix}/lib/freeradius/rlm_radutmp*.so -%{_prefix}/lib/freeradius/rlm_realm*.so -%{_prefix}/lib/freeradius/rlm_sql-*.so -%{_prefix}/lib/freeradius/rlm_sql.so -%{_prefix}/lib/freeradius/rlm_sqlcounter*.so -%{_prefix}/lib/freeradius/rlm_sql_log*.so -%{_prefix}/lib/freeradius/rlm_sql_mysql*.so -%{_prefix}/lib/freeradius/rlm_sql_postgresql*.so -%{_prefix}/lib/freeradius/rlm_sql_unixodbc*.so -%{_prefix}/lib/freeradius/rlm_unix*.so -%{_prefix}/lib/freeradius/rlm_otp*.so +%attr(755,root,root) %dir %{_libdir}/freeradius +#%attr(755,root,root) %{_libdir}/freeradius/*.so* +%{_libdir}/freeradius/libeap*.so +%{_libdir}/freeradius/libradius*.so +%{_libdir}/freeradius/rlm_acct_unique*.so +%{_libdir}/freeradius/rlm_always*.so +%{_libdir}/freeradius/rlm_attr_filter*.so +%{_libdir}/freeradius/rlm_attr_rewrite*.so +%{_libdir}/freeradius/rlm_chap*.so +%{_libdir}/freeradius/rlm_checkval*.so +%{_libdir}/freeradius/rlm_counter*.so +%{_libdir}/freeradius/rlm_dbm*.so +%{_libdir}/freeradius/rlm_detail*.so +%{_libdir}/freeradius/rlm_digest*.so +%{_libdir}/freeradius/rlm_eap-*.so +%{_libdir}/freeradius/rlm_eap.so +%{_libdir}/freeradius/rlm_eap_gtc*.so +%{_libdir}/freeradius/rlm_eap_leap*.so +%{_libdir}/freeradius/rlm_eap_md5*.so +%{_libdir}/freeradius/rlm_eap_mschapv2*.so +%{_libdir}/freeradius/rlm_eap_peap*.so +%{_libdir}/freeradius/rlm_eap_sim*.so +%{_libdir}/freeradius/rlm_eap_tls*.so +%{_libdir}/freeradius/rlm_eap_ttls*.so +%{_libdir}/freeradius/rlm_exec*.so +%{_libdir}/freeradius/rlm_expr*.so +%{_libdir}/freeradius/rlm_fastusers*.so +%{_libdir}/freeradius/rlm_files*.so +%{_libdir}/freeradius/rlm_ippool*.so +%{_libdir}/freeradius/rlm_krb5*.so +%{_libdir}/freeradius/rlm_ldap*.so +%{_libdir}/freeradius/rlm_mschap*.so +%{_libdir}/freeradius/rlm_ns_mta_md5*.so +%{_libdir}/freeradius/rlm_pam*.so +%{_libdir}/freeradius/rlm_pap*.so +%{_libdir}/freeradius/rlm_passwd*.so +%{_libdir}/freeradius/rlm_perl*.so +%{_libdir}/freeradius/rlm_preprocess*.so +%{_libdir}/freeradius/rlm_radutmp*.so +%{_libdir}/freeradius/rlm_realm*.so +%{_libdir}/freeradius/rlm_sql-*.so +%{_libdir}/freeradius/rlm_sql.so +%{_libdir}/freeradius/rlm_sqlcounter*.so +%{_libdir}/freeradius/rlm_sqlippool*.so +%{_libdir}/freeradius/rlm_sql_log*.so +%{_libdir}/freeradius/rlm_sql_mysql*.so +%{_libdir}/freeradius/rlm_sql_postgresql*.so +%{_libdir}/freeradius/rlm_sql_unixodbc*.so +%{_libdir}/freeradius/rlm_unix*.so +%{_libdir}/freeradius/rlm_otp*.so # man-pages %doc %{_mandir}/man1/* %doc %{_mandir}/man5/* %doc %{_mandir}/man8/* # dictionaries -%attr(755,root,root) %dir /usr/share/freeradius -/usr/share/freeradius/* +%attr(755,root,root) %dir %{_datadir}/freeradius +%{_datadir}/freeradius/* # logs -%attr(700,radiusd,radiusd) %dir /var/log/radius/ -%attr(700,radiusd,radiusd) %dir /var/log/radius/radacct/ -%attr(644,radiusd,radiusd) /var/log/radius/radutmp +%attr(700,radiusd,radiusd) %dir %{_localstatedir}/log/radius/ +%attr(700,radiusd,radiusd) %dir %{_localstatedir}/log/radius/radacct/ +%attr(644,radiusd,radiusd) %{_localstatedir}/log/radius/radutmp %files dialupadmin %defattr(-,root,root) @@ -332,10 +310,28 @@ %files devel %defattr(-,root,root) -%{_prefix}/lib/freeradius/*.a -#%attr(644,root,root) /usr/lib/freeradius/*.la - +%{_libdir}/freeradius/*.a %changelog +* Tue Nov 06 2007 - prusnak@suse.cz +- updated to 1.1.7 + Feature Improvements + * Updated LDAP documentation. + * Added note on DH parameters in eap.conf, and debugging messages + which complain if DH is used, but not configured properly. + * Updated the Mikrotik dictionary. Added a note that the sample + dictionary they supply is broken. + * Output more information on blocked threads, which should help + narrow down which modules is causing the problem. + * Added more eDirectory support. + * rlm_ldap now prints out attributes in the standard format + * Enabled server-side handling of procedures in MySQL + Bug Fixes + * Added NT-Hash support for mschap_xlat. + * Corrected documentation to point to correct location of files. + * Checks for more recent FreeBSD versions. + * uses -DLDAP_DEPRECATED to avoid OpenLDAP crashes. + * Use correct value for authentication name in rlm_mschap. + * Fix over-ride for usernames when use_tunneled_reply = yes. * Fri Apr 20 2007 - pth@suse.de - Update to 1.1.6. Changes since 1.1.3: Feature improvements ++++++ freeradius-1.1.7-dialup_admin.patch ++++++ --- dialup_admin/bin/clean_radacct +++ dialup_admin/bin/clean_radacct @@ -6,7 +6,7 @@ # use POSIX; -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf'; +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf'; $back_days = 35; --- dialup_admin/bin/dialup_admin.cron +++ dialup_admin/bin/dialup_admin.cron @@ -1,4 +1,4 @@ -1 0 * * * /usr/local/dialup_admin/bin/tot_stats >/dev/null 2>&1 -5 0 * * * /usr/local/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1 -10 0 1 * * /usr/local/dialup_admin/bin/truncate_radacct >/dev/null 2>&1 -15 0 1 * * /usr/local/dialup_admin/bin/clean_radacct >/dev/null 2>&1 +1 0 * * * /usr/share/dialup_admin/bin/tot_stats >/dev/null 2>&1 +5 0 * * * /usr/share/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1 +10 0 1 * * /usr/share/dialup_admin/bin/truncate_radacct >/dev/null 2>&1 +15 0 1 * * /usr/share/dialup_admin/bin/clean_radacct >/dev/null 2>&1 --- dialup_admin/bin/log_badlogins +++ dialup_admin/bin/log_badlogins @@ -17,7 +17,7 @@ $|=1; $file=shift||'none'; -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf'; +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf'; $all_file=shift||'no'; # # Uncomment to force inserts even if there are sql errors. That can --- dialup_admin/bin/monthly_tot_stats +++ dialup_admin/bin/monthly_tot_stats @@ -8,7 +8,7 @@ # Works only with mysql and postgresql # -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf'; +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf'; open CONF, "<$conf" --- dialup_admin/bin/showmodem +++ dialup_admin/bin/showmodem @@ -7,7 +7,7 @@ $comm=shift || "public"; $type=shift|| "xml"; -$conf='/usr/local/dialup_admin/conf/admin.conf'; +$conf='/usr/share/dialup_admin/conf/admin.conf'; open CONF, "<$conf" or die "Could not open configuration file\n"; while(<CONF>){ --- dialup_admin/bin/snmpfinger +++ dialup_admin/bin/snmpfinger @@ -6,7 +6,7 @@ $comm=shift || 'public'; $type=shift || 'cisco'; -$conf='/usr/local/dialup_admin/conf/admin.conf'; +$conf='/usr/share/dialup_admin/conf/admin.conf'; open CONF, "<$conf" or die "Could not open configuration file\n"; while(<CONF>){ --- dialup_admin/bin/tot_stats +++ dialup_admin/bin/tot_stats @@ -7,7 +7,7 @@ # Works with mysql and postgresql # -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf'; +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf'; open CONF, "<$conf" --- dialup_admin/bin/truncate_radacct +++ dialup_admin/bin/truncate_radacct @@ -6,7 +6,7 @@ # use POSIX; -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf'; +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf'; $back_days = 90; --- dialup_admin/conf/admin.conf +++ dialup_admin/conf/admin.conf @@ -19,11 +19,11 @@ # # The directory where dialupadmin is installed # -general_base_dir: /usr/local/dialup_admin +general_base_dir: /usr/share/dialup_admin # # The base directory of the freeradius radius installation # -general_radiusd_base_dir: /usr/local/radiusd +general_radiusd_base_dir: / general_domain: company.com # # Set it to yes to use sessions and cache the various mappings @@ -66,8 +66,8 @@ general_raddb_dir: %{general_radiusd_base_dir}/etc/raddb general_ldap_attrmap: %{general_raddb_dir}/ldap.attrmap # Need to fix admin.conf file parser -#general_clients_conf: %{general_raddb_dir}/clients.conf -general_clients_conf: /usr/local/etc/raddb/clients.conf +general_clients_conf: %{general_raddb_dir}/clients.conf +#general_clients_conf: /usr/local/etc/raddb/clients.conf general_sql_attrmap: %{general_base_dir}/conf/sql.attrmap general_accounting_attrs_file: %{general_base_dir}/conf/accounting.attrs general_extra_ldap_attrmap: %{general_base_dir}/conf/extra.ldap-attrmap @@ -235,19 +235,19 @@ # This variable is used by the scripts in the bin folder # It should contain the path to the sql binary used to run # sql commands (mysql and psql are only supported for now) -sql_command: /usr/local/bin/mysql +sql_command: /usr/bin/mysql # # This variable is used by the scripts in the bin folder # It should contain the snmp type and path to the binary # used to run snmp commands. # (ucd = UCD-Snmp and net = Net-Snmp are only supported for now) general_snmp_type: net -general_snmpwalk_command: /usr/local/bin/snmpwalk -general_snmpget_command: /usr/local/bin/snmpget +general_snmpwalk_command: /usr/bin/snmpwalk +general_snmpget_command: /usr/bin/snmpget # # Uncomment to enable sql debug # -sql_debug: true +#sql_debug: true # # If set to yes then the HTTP credentials (http authentication) # will be used to connect to the sql server instead of sql_username ++++++ freeradius-1.1.7-ltdl.patch ++++++ --- src/main/modules.c +++ src/main/modules.c @@ -204,7 +204,11 @@ /* * Keep the handle around so we can dlclose() it. */ - handle = lt_dlopenext(module_name); + char *tmp = malloc(strlen(module_name) + 4); + strcpy(tmp, module_name); + strcat(tmp, ".so"); + handle = lt_dlopenext(tmp); + free(tmp); if (handle == NULL) { radlog(L_ERR|L_CONS, "%s[%d] Failed to link to module '%s':" " %s\n", cffilename, cflineno, module_name, lt_dlerror()); --- src/modules/rlm_eap/eap.c +++ src/modules/rlm_eap/eap.c @@ -82,7 +82,11 @@ snprintf(buffer, sizeof(buffer), "rlm_eap_%s", eaptype_name); /* Link the loaded EAP-Type */ - handle = lt_dlopenext(buffer); + char *tmp = malloc(strlen(buffer) + 4); + strcpy(tmp, buffer); + strcat(tmp, ".so"); + handle = lt_dlopenext(tmp); + free(tmp); if (handle == NULL) { radlog(L_ERR, "rlm_eap: Failed to link EAP-Type/%s: %s", eaptype_name, lt_dlerror()); --- src/modules/rlm_sql/rlm_sql.c +++ src/modules/rlm_sql/rlm_sql.c @@ -668,7 +668,11 @@ return -1; } - inst->handle = lt_dlopenext(inst->config->sql_driver); + char *tmp = malloc(strlen(inst->config->sql_driver) + 4); + strcpy(tmp, inst->config->sql_driver); + strcat(tmp, ".so"); + inst->handle = lt_dlopenext(tmp); + free(tmp); if (inst->handle == NULL) { radlog(L_ERR, "rlm_sql (%s): Could not link driver %s: %s", inst->config->xlat_name, inst->config->sql_driver, ++++++ freeradius-1.1.6.tar.bz2 -> freeradius-1.1.7.tar.bz2 ++++++ ++++ 18417 lines of diff (skipped) ++++++ freeradius-1.1.7-type_punning.patch ++++++ --- src/lib/valuepair.c +++ src/lib/valuepair.c @@ -725,13 +725,17 @@ break; case PW_TYPE_DATE: - if (gettime(value, (time_t *)&vp->lvalue) < 0) { + { + union{uint32_t *lvp; time_t *tp;}pun = { &vp->lvalue }; + + if (gettime(value, pun.tp) < 0) { librad_log("failed to parse time string " "\"%s\"", value); return NULL; } vp->length = 4; break; + } case PW_TYPE_ABINARY: #ifdef ASCEND_BINARY if (strncasecmp(value, "0x", 2) == 0) { --- src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c +++ src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c @@ -215,13 +215,13 @@ static int sql_num_fields(SQLSOCK *sqlsocket, SQL_CONFIG *config) { rlm_sql_unixodbc_sock *unixodbc_sock = sqlsocket->conn; long err_handle; - int num_fields = 0; + union{int num_fields;SQLSMALLINT sqlsi; }pun = {0}; - err_handle = SQLNumResultCols(unixodbc_sock->stmt_handle,(SQLSMALLINT *)&num_fields); + err_handle = SQLNumResultCols(unixodbc_sock->stmt_handle,&pun.sqlsi); if (sql_state(err_handle, sqlsocket, config)) return -1; - return num_fields; + return pun.num_fields; } ++++++ rcradiusd ++++++ --- freeradius/rcradiusd 2006-03-28 21:04:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/freeradius/rcradiusd 2007-11-06 13:12:07.000000000 +0100 @@ -12,7 +12,7 @@ # ### BEGIN INIT INFO # Provides: radiusd -# Required-Start: $network $syslog $remotefs +# Required-Start: $network $syslog $remote_fs # Required-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org