summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Howard <lukeh@padl.com>2011-11-14 12:43:48 +1100
committerLuke Howard <lukeh@padl.com>2011-11-14 12:43:48 +1100
commit3fd136cdbc85ddff5ed0a5953ee1827b9a948748 (patch)
tree3f107214f42f51be4b465057d3948c2862ad9177
parenta13cddc1331aa1f5e7dca7d1b44482951d2757bf (diff)
remove rs_context_init_freeradius_dict
-rw-r--r--lib/examples/client-blocking.c4
-rw-r--r--lib/include/radsec/radsec.h14
-rw-r--r--lib/radsec.c32
-rw-r--r--lib/radsec.sym1
4 files changed, 0 insertions, 51 deletions
diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 419be8c..509e68a 100644
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -31,8 +31,6 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
{
struct rs_peer *server;
- if (rs_context_init_freeradius_dict (h, "/usr/share/freeradius/dictionary"))
- goto cleanup;
if (rs_conn_create (h, &conn, NULL))
goto cleanup;
rs_conn_set_type (conn, RS_CONN_TYPE_UDP);
@@ -48,8 +46,6 @@ blocking_client (const char *av1, const char *av2, int use_request_object_flag)
#else /* defined (USE_CONFIG_FILE) */
if (rs_context_read_config (h, av1))
goto cleanup;
- if (rs_context_init_freeradius_dict (h, NULL))
- goto cleanup;
if (rs_conn_create (h, &conn, av2))
goto cleanup;
#endif /* defined (USE_CONFIG_FILE) */
diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h
index 1aef6bb..4e5e426 100644
--- a/lib/include/radsec/radsec.h
+++ b/lib/include/radsec/radsec.h
@@ -166,20 +166,6 @@ int rs_context_create(struct rs_context **ctx);
all other libradsec objects have been freed. */
void rs_context_destroy(struct rs_context *ctx);
-/** Initialize FreeRADIUS dictionary needed for creating packets.
-
- \a ctx Context.
-
- \a dict Optional string with full path to FreeRADIUS dictionary.
- If \a dict is NULL the path to the dictionary file is taken from
- the "dictionary" configuration directive. Note that the
- configuration file must be read prior to using this option (see \a
- rs_context_read_config).
-
- \return RSE_OK (0) on success, RSE_NOMEM on memory allocation
- error and RSE_FR on FreeRADIUS error. */
-int rs_context_init_freeradius_dict(struct rs_context *ctx, const char *dict);
-
/** Set allocation scheme to use. \a scheme is the allocation scheme
to use, see \a rs_alloc_scheme. \return On success, RSE_OK (0) is
returned. On error, !0 is returned and a struct \a rs_error is
diff --git a/lib/radsec.c b/lib/radsec.c
index 70a968e..7421755 100644
--- a/lib/radsec.c
+++ b/lib/radsec.c
@@ -48,38 +48,6 @@ rs_context_create (struct rs_context **ctx)
return RSE_OK;
}
-/** Initialize freeradius dictionary. */
-int
-rs_context_init_freeradius_dict (struct rs_context *ctx, const char *dict)
-{
- int r = RSE_OK;
- size_t dictlen;
- char *dir = NULL;
- char *fn = NULL;
-
- if (dict == NULL)
- if (ctx->config != NULL && ctx->config->dictionary)
- dict = ctx->config->dictionary;
-
- dictlen = strlen (dict);
- dir = rs_calloc (ctx, 1, dictlen + 1);
- fn = rs_calloc (ctx, 1, dictlen + 1);
- if (dir == NULL || fn == NULL)
- {
- r = rs_err_ctx_push_fl (ctx, RSE_NOMEM, __FILE__, __LINE__, NULL);
- goto out;
- }
- strncpy (dir, dict, dictlen);
- strncpy (fn, dict, dictlen);
-
- out:
- if (dir)
- rs_free (ctx, dir);
- if (fn)
- rs_free (ctx, fn);
- return r;
-}
-
struct rs_error *
rs_resolv (struct evutil_addrinfo **addr,
rs_conn_type_t type,
diff --git a/lib/radsec.sym b/lib/radsec.sym
index aec17cd..c5890a9 100644
--- a/lib/radsec.sym
+++ b/lib/radsec.sym
@@ -50,7 +50,6 @@ rs_conn_set_timeout
rs_conn_set_type
rs_context_create
rs_context_destroy
-rs_context_init_freeradius_dict
rs_context_read_config
rs_context_set_alloc_scheme
rs_dump_packet