From 96e340780e946c53a013a2605984ef30adcf9963 Mon Sep 17 00:00:00 2001
From: Nigel Kukard <nkukard@lbsd.net>
Date: Wed, 29 Apr 2009 13:02:57 +0000
Subject: [PATCH] * Fixed bug where configuration items were not read in
properly * Changed user. macros to userdb. in hard coded defaults
---
smradius/modules/userdb/mod_userdb_sql.pm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/smradius/modules/userdb/mod_userdb_sql.pm b/smradius/modules/userdb/mod_userdb_sql.pm
index ab74af5b..d0774859 100644
--- a/smradius/modules/userdb/mod_userdb_sql.pm
+++ b/smradius/modules/userdb/mod_userdb_sql.pm
@@ -81,7 +81,7 @@ sub init
FROM
@TP@group_attributes, @TP@users_to_groups
WHERE
- users_to_groups.UserID = %{user.ID}
+ users_to_groups.UserID = %{userdb.ID}
AND group_attributes.GroupID = users_to_groups.GroupID
';
@@ -91,7 +91,7 @@ sub init
FROM
@TP@user_attributes
WHERE
- UserID = %{user.ID}
+ UserID = %{userdb.ID}
';
@@ -101,7 +101,16 @@ sub init
if (defined($scfg->{'mod_userdb_sql'}->{'userdb_find_query'}) &&
$scfg->{'mod_userdb_sql'}->{'userdb_find_query'} ne "") {
$config->{'userdb_find_query'} = $scfg->{'mod_userdb_sql'}->{'userdb_find_query'};
-
+ }
+
+ if (defined($scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'}) &&
+ $scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'} ne "") {
+ $config->{'userdb_get_group_attributes_query'} = $scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'};
+ }
+
+ if (defined($scfg->{'mod_userdb_sql'}->{'userdb_get_user_attributes_query'}) &&
+ $scfg->{'mod_userdb_sql'}->{'userdb_get_user_attributes_query'} ne "") {
+ $config->{'userdb_get_user_attributes_query'} = $scfg->{'mod_userdb_sql'}->{'userdb_get_user_attributes_query'};
}
}
}
--
GitLab