[Pkg-voip-commits] [asterisk] 01/01: Fix default RADIUS configuration path when using libfreeradius-client.

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 8313aae72478fd5a1e5b4c585c24f812dd90e2e6
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Dec 13 10:18:36 2013 +0100

    Fix default RADIUS configuration path when using libfreeradius-client.
---
 debian/changelog                 |  6 ++++++
 debian/patches/freeradius-client | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b14aa0..498a6c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+asterisk (1:11.6.0~dfsg-3) unstable; urgency=medium
+
+  * Fix default RADIUS configuration path when using libfreeradius-client.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 13 Dec 2013 10:10:50 +0100
+
 asterisk (1:11.6.0~dfsg-2) unstable; urgency=medium
 
   [ Jeremy Lainé ]
diff --git a/debian/patches/freeradius-client b/debian/patches/freeradius-client
index e5c3ed1..f645bc1 100644
--- a/debian/patches/freeradius-client
+++ b/debian/patches/freeradius-client
@@ -15,6 +15,18 @@ Author: Jeremy Lainé <jeremy.laine at m4x.org>
  
  #include "asterisk/channel.h"
  #include "asterisk/cdr.h"
+@@ -82,7 +86,11 @@
+ static const char name[] = "radius";
+ static const char cdr_config[] = "cdr.conf";
+ 
++#ifdef FREERADIUS_CLIENT
++static char radiuscfg[PATH_MAX] = "/etc/radiusclient/radiusclient.conf";
++#else
+ static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
++#endif
+ 
+ static struct ast_flags global_flags = { RADIUS_FLAG_USEGMTIME | RADIUS_FLAG_LOGUNIQUEID | RADIUS_FLAG_LOGUSERFIELD };
+ 
 --- a/cel/cel_radius.c	2013-12-11 10:08:13.537159711 +0100
 +++ b/cel/cel_radius.c	2013-12-11 10:08:13.529159762 +0100
 @@ -35,7 +35,11 @@
@@ -29,6 +41,18 @@ Author: Jeremy Lainé <jeremy.laine at m4x.org>
  
  #include "asterisk/channel.h"
  #include "asterisk/cel.h"
+@@ -79,7 +83,11 @@
+ 
+ static char *cel_config = "cel.conf";
+ 
++#ifdef FREERADIUS_CLIENT
++static char radiuscfg[PATH_MAX] = "/etc/radiusclient/radiusclient.conf";
++#else
+ static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
++#endif
+ 
+ static struct ast_flags global_flags = { RADIUS_FLAG_USEGMTIME | RADIUS_FLAG_LOGUNIQUEID | RADIUS_FLAG_LOGUSERFIELD };
+ 
 --- a/configure.ac	2013-12-11 10:08:13.537159711 +0100
 +++ b/configure.ac	2013-12-11 10:11:02.420053317 +0100
 @@ -2103,7 +2103,14 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git