freeradius/freeradius-fix-dhcp-dictionary-loading.patch
Nikolai Kondrashov d2cf93dd4f Fix five issues
2014-10-14 15:33:44 +03:00

41 lines
1.3 KiB
Diff

From dda57af171687d60e21e8e2620e87b25939d0c29 Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date: Mon, 6 Oct 2014 17:00:25 +0300
Subject: [PATCH 1/1] dhcpclient: Load dictionary.dhcp from DICTDIR.
Load dictionary.dhcp from DICTDIR instead of RADDBDIR in dhcpclient.c,
as it is found only in the former.
This fixes the following error printed when invoking dhcpclient:
Failed reading dictionary.dhcp: dict_init: Couldn't open dictionary
"/etc/raddb/dictionary.dhcp": No such file or directory
---
src/modules/proto_dhcp/dhcpclient.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/proto_dhcp/dhcpclient.c b/src/modules/proto_dhcp/dhcpclient.c
index b29b9a2..ac52ffd 100644
--- a/src/modules/proto_dhcp/dhcpclient.c
+++ b/src/modules/proto_dhcp/dhcpclient.c
@@ -264,6 +264,7 @@ int main(int argc, char **argv)
char *p;
int c;
char const *radius_dir = RADDBDIR;
+ char const *dict_dir = DICTDIR;
char const *filename = NULL;
DICT_ATTR const *da;
@@ -315,7 +316,7 @@ int main(int argc, char **argv)
*/
da = dict_attrbyname("DHCP-Message-Type");
if (!da) {
- if (dict_read(radius_dir, "dictionary.dhcp") < 0) {
+ if (dict_read(dict_dir, "dictionary.dhcp") < 0) {
fprintf(stderr, "Failed reading dictionary.dhcp: %s",
fr_strerror());
return -1;
--
2.1.1