From 217d24060890986d38848e0a9fd68ae6e7d1727f Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 21 Mar 2011 13:33:22 +0100
Subject: API AND CONFIG CHANGE: rs_context_create() doesn't take DICT any
 more.

Use rs_context_create() to read FreeRADIUS dictionary, possibly by
taking dict file from configuration file.

CONFIG CHANGE: s/config/realm/g.
---
 lib/include/radsec/radsec-impl.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib/include/radsec/radsec-impl.h')

diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h
index 3c1c53c..f8891ee 100644
--- a/lib/include/radsec/radsec-impl.h
+++ b/lib/include/radsec/radsec-impl.h
@@ -35,7 +35,8 @@ struct rs_error {
     char buf[1024];
 };
 
-struct rs_peer {		/* Config object for a connection.  */
+/** Configuration object for a connection.  */
+struct rs_peer {
     struct rs_connection *conn;
     struct rs_realm *realm;
     struct evutil_addrinfo *addr;
@@ -43,7 +44,8 @@ struct rs_peer {		/* Config object for a connection.  */
     struct rs_peer *next;
 };
 
-struct rs_realm {	      /* Config object for a RADIUS realm.  */
+/** Configuration object for a RADIUS realm.  */
+struct rs_realm {
     char *name;
     enum rs_conn_type type;
     int timeout;
@@ -56,12 +58,18 @@ struct rs_realm {	      /* Config object for a RADIUS realm.  */
     struct rs_realm *next;
 };
 
-struct rs_context {
+/** Top configuration object.  */
+struct rs_config {
+    char *dictionary;
     struct rs_realm *realms;
+    cfg_t *cfg;
+};
+
+struct rs_context {
+    struct rs_config *config;
     struct rs_alloc_scheme alloc_scheme;
     struct rs_error *err;
     fr_randctx fr_randctx;
-    cfg_t *cfg;
 };
 
 struct rs_connection {
-- 
cgit v1.1