diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2011-03-01 15:53:45 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2011-03-01 15:53:45 +0300 |
| commit | f02ea2ef3474d56814ec77a28fa1ea85c8afd31e (patch) | |
| tree | eca3d77b16f8dda66ed6f61bb94c017e67cf5b56 | |
| parent | 16a935779f6909543c07f910f6afd9af72cc267a (diff) | |
| download | accel-ppp-f02ea2ef3474d56814ec77a28fa1ea85c8afd31e.tar.gz accel-ppp-f02ea2ef3474d56814ec77a28fa1ea85c8afd31e.zip | |
radius: fixed operation without accounting server
| -rw-r--r-- | accel-pppd/radius/acct.c | 6 | ||||
| -rw-r--r-- | contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild | 88 |
2 files changed, 6 insertions, 88 deletions
diff --git a/accel-pppd/radius/acct.c b/accel-pppd/radius/acct.c index 6238793..01e73af 100644 --- a/accel-pppd/radius/acct.c +++ b/accel-pppd/radius/acct.c @@ -187,6 +187,9 @@ int rad_acct_start(struct radius_pd_t *rpd) time_t ts; unsigned int dt; + if (!conf_acct_secret) + return 0; + rpd->acct_req = rad_req_alloc(rpd, CODE_ACCOUNTING_REQUEST, rpd->ppp->username); if (!rpd->acct_req) { log_emerg("radius: out of memory\n"); @@ -278,6 +281,9 @@ void rad_acct_stop(struct radius_pd_t *rpd) time_t ts; unsigned int dt; + if (!conf_acct_secret) + return; + if (rpd->acct_interim_timer.tpd) triton_timer_del(&rpd->acct_interim_timer); diff --git a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild deleted file mode 100644 index 395dd6b..0000000 --- a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 - -inherit eutils linux-mod cmake-utils - -DESCRIPTION="PPtP/L2TP/PPPoE Server for Linux" -SRC_URI="http://sourceforge.net/projects/accel-ppp/files/accel-ppp/${P}.tar.bz2" -HOMEPAGE="http://accel-ppp.sourceforge.net/" - -SLOT="0" -LICENSE="GPL" -KEYWORDS="~amd64 ~x86" -IUSE="postgres debug shaper pptp_driver radius" - -DEPEND=">=sys-libs/glibc-2.8 - dev-libs/openssl - dev-libs/libaio - shaper? ( =dev-libs/libnl-2* ) - postgres? ( dev-db/postgresql-base )" - -RDEPEND="$DEPEND - pptp_driver? ( virtual/modutils )" - -BUILD_TARGETS="default" -BUILD_PARAMS="KDIR=${KERNEL_DIR}" -CONFIG_CHECK="PPP PPPOE" -MODULESD_PPTP_ALIASES=("net-pf-24 pptp") -PREFIX="/" -MODULE_NAMES="pptp(extra:${S}/driver/)" - -src_prepare() { - sed -i -e "/mkdir/d" "${S}/accel-pppd/CMakeLists.txt" - sed -i -e "/echo/d" "${S}/accel-pppd/CMakeLists.txt" - sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt" -} - -src_configure() { - if use debug; then - mycmakeargs+=( "-DCMAKE_BUILD_TYPE=Debug" ) - fi - - if use postgres; then - mycmakeargs+=( "-DLOG_PGSQL=TRUE" ) - fi - - if use shaper; then - mycmakeargs+=( "-DSHAPER=TRUE" ) - fi - - if ! use radius; then - mycmakeargs+=( "-DRADIUS=FALSE" ) - fi - - mycmakeargs+=( "-DCMAKE_INSTALL_PREFIX=/usr" ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use pptp_driver; then - cd ${S}/driver - #convert_to_m Makefile - linux-mod_src_compile || die "failed to build driver" - fi -} - -src_install() { - cmake-utils_src_install - - if use pptp_driver; then - cd ${S}/driver - linux-mod_src_install - fi - - exeinto /etc/init.d - newexe "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-init" accel-pppd - - insinto /etc/conf.d - newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd" accel-pppd - - dodir /var/log/accel-ppp - dodir /var/run/accel-ppp - dodir /var/run/radattr -} |