Merge branch 'libradsec-new-client' into libradsec

1 files changed, 3 insertions, 51 deletions

diff --git a/lib/radsec.c b/lib/radsec.c
index e176b6d..d14ad50 100644
--- a/lib/radsec.c
+++ b/lib/radsec.c
@@ -1,5 +1,5 @@
 /* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
-   See the file COPYING for licensing information.  */
+   See LICENSE for licensing information.  */
 
 #if defined HAVE_CONFIG_H
 #include <config.h>
@@ -12,7 +12,7 @@
 #include <libgen.h>
 #include <assert.h>
 
-#include <freeradius/libradius.h>
+#include <radius/client.h>
 #include <event2/event.h>
 #include <event2/util.h>
 #include <radsec/radsec.h>
@@ -39,14 +39,8 @@ rs_context_create (struct rs_context **ctx)
 #if defined (RS_ENABLE_TLS)
   ssl_init ();
 #endif
-#if defined (DEBUG)
-  fr_log_fp = stderr;
-  fr_debug_flag = 1;
-#endif
-  debug_init ("libradsec");	/* radsecproxy compat, FIXME: remove */
 
-  fr_randinit (&h->fr_randctx, 0);
-  fr_rand_seed (NULL, 0);
+  debug_init ("libradsec");	/* radsecproxy compat, FIXME: remove */
 
   if (ctx != NULL)
     *ctx = h;
@@ -54,48 +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;
-
-  if (dict == NULL)
-    dict = RS_FREERADIUS_DICT;
-
-  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);
-
-  if (dict_init (dirname (dir), basename (fn)) < 0)
-    {
-      r = rs_err_ctx_push_fl (ctx, RSE_FR, __FILE__, __LINE__,
-			      "failing dict_init(\"%s\")", dict);
-      goto out;
-    }
-
- out:
-  if (dir)
-    rs_free (ctx, dir);
-  if (fn)
-    rs_free (ctx, fn);
-  return r;
-}
-
 struct rs_error *
 rs_resolve (struct evutil_addrinfo **addr,
             rs_conn_type_t type,