diff options
| author | adrianp <adrianp@pkgsrc.org> | 2005-09-20 18:46:32 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2005-09-20 18:46:32 +0000 |
| commit | 814d8edbbad66ab7dacf960b20c487ca69109544 (patch) | |
| tree | c7dc5fc586cbed0b4fd22bbdb5ea20b5a8462b08 /net/freeradius | |
| parent | 8f23e01f7867e0328e0bb2eef5232556669c6f59 (diff) | |
| download | pkgsrc-814d8edbbad66ab7dacf960b20c487ca69109544.tar.gz | |
Add logging fix from FreeRADIUS CVS pointed out by aland (at) ox.org
Bump to nb1
Diffstat (limited to 'net/freeradius')
| -rw-r--r-- | net/freeradius/Makefile | 3 | ||||
| -rw-r--r-- | net/freeradius/distinfo | 3 | ||||
| -rw-r--r-- | net/freeradius/patches/patch-ak | 35 |
3 files changed, 39 insertions, 2 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 7e8586005a6..e54c154cf74 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2005/09/11 12:57:34 adrianp Exp $ +# $NetBSD: Makefile,v 1.35 2005/09/20 18:46:32 adrianp Exp $ DISTNAME= freeradius-1.0.5 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \ ftp://ftp.Awfulhak.org/pub/radius/ diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo index a423a5bf266..d9cf9c7c755 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2005/09/11 12:57:34 adrianp Exp $ +$NetBSD: distinfo,v 1.17 2005/09/20 18:46:32 adrianp Exp $ SHA1 (freeradius-1.0.5.tar.gz) = 6d69629c9686a31bf6548972f3daf6f89451da37 RMD160 (freeradius-1.0.5.tar.gz) = 8e8cd3937216c3c18dcfc3a217a43a00e3f81258 @@ -6,3 +6,4 @@ Size (freeradius-1.0.5.tar.gz) = 2294225 bytes SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773 SHA1 (patch-ai) = bb4dafd3f6b961403caa955c9a09c271468ada36 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e +SHA1 (patch-ak) = 55e4405c714cc78fd4ecab963b6750440402a157 diff --git a/net/freeradius/patches/patch-ak b/net/freeradius/patches/patch-ak new file mode 100644 index 00000000000..91b8c241265 --- /dev/null +++ b/net/freeradius/patches/patch-ak @@ -0,0 +1,35 @@ +$NetBSD: patch-ak,v 1.5 2005/09/20 18:46:32 adrianp Exp $ + +--- src/modules/rlm_sql/rlm_sql.c.orig 2005/08/31 12:49:52 1.131.2.4 ++++ src/modules/rlm_sql/rlm_sql.c 2005/09/17 13:03:31 1.131.2.5 +@@ -910,8 +910,9 @@ static int rlm_sql_accounting(void *inst + if ((pair = pairfind(request->packet->vps, PW_ACCT_STATUS_TYPE)) != NULL) { + acctstatustype = pair->lvalue; + } else { +- radius_xlat(logstr, sizeof(logstr), "rlm_sql: packet has no account status type. [user '%{User-Name}', nas '%{NAS-IP-Address}']", request, sql_escape_func); +- radlog(L_ERR, logstr); ++ radius_xlat(logstr, sizeof(logstr), "packet has no accounting status type. [user '%{User-Name}', nas '%{NAS-IP-Address}']", request, NULL); ++ radlog(L_ERR, "rlm_sql (%s) in sql_accounting: %s", ++ inst->config->xlat_name, logstr); + return RLM_MODULE_INVALID; + } + +@@ -1077,12 +1078,12 @@ static int rlm_sql_accounting(void *inst + if ((pair = pairfind(request->packet->vps, PW_ACCT_SESSION_TIME)) != NULL) + acctsessiontime = pair->lvalue; + +- if (acctsessiontime <= 0) { +- radius_xlat(logstr, sizeof(logstr), "rlm_sql: Stop packet with zero session length. (user '%{User-Name}', nas '%{NAS-IP-Address}')", request, sql_escape_func); +- radlog(L_ERR, logstr); +- sql_release_socket(inst, sqlsocket); +- ret = RLM_MODULE_NOOP; +- } ++ if (acctsessiontime <= 0) { ++ radius_xlat(logstr, sizeof(logstr), "stop packet with zero session length. [user '%{User-Name}', nas '%{NAS-IP-Address}']", request, NULL); ++ radlog(L_ERR, "rlm_sql (%s) in sql_accounting: %s", inst->config->xlat_name, logstr); ++ sql_release_socket(inst, sqlsocket); ++ ret = RLM_MODULE_NOOP; ++ } + #endif + + radius_xlat(querystr, sizeof(querystr), inst->config->accounting_stop_query_alt, request, sql_escape_func); |