Explicitly link libfreeradius-io to libfreeradius-server

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index 5d9cbea75ddc05805354a96f83fbb5c3bb39af33..d02752412209d0b1cb27c3eea77e92faa17ad353 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -389,7 +389,6 @@ size_t              rad_filename_make_safe(UNUSED REQUEST *request, char *out, size_t outlen
 size_t         rad_filename_escape(UNUSED REQUEST *request, char *out, size_t outlen,
                                    char const *in, UNUSED void *arg);
 ssize_t                rad_filename_unescape(char *out, size_t outlen, char const *in, size_t inlen);
-void           talloc_const_free(void const *ptr);
 char           *rad_ajoin(TALLOC_CTX *ctx, char const **argv, int argc, char c);
 REQUEST                *request_alloc(TALLOC_CTX *ctx);
 REQUEST                *request_alloc_fake(REQUEST *oldreq);

diff --git a/src/include/talloc.h b/src/include/talloc.h
index 7aa94446d8c1b5e62db3bb3da1fae589e22db2ff..57cf1170bab1dabe30b4a94adc84ed0ff0ca2e52 100644 (file)
--- a/src/include/talloc.h
+++ b/src/include/talloc.h
@@ -41,6 +41,8 @@ void          **talloc_array_null_terminate(void **array);
 
 void           **talloc_array_null_strip(void **array);
 
+void           talloc_const_free(void const *ptr);
+
 /*
  *     talloc portability issues.  'const' is not part of the talloc
  *     type, but it is part of the pointer type.  But only if

diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 4d986c6b5e4726afa351a1727c2f4f32268530b8..9434dbfc143df8451255662c2224bf65a4bf0a3d 100644 (file)
--- a/src/lib/io/all.mk
+++ b/src/lib/io/all.mk
@@ -3,7 +3,7 @@ TARGET  := libfreeradius-io.a
 SOURCES        :=      ring_buffer.c message.c atomic_queue.c queue.c time.c channel.c track.c worker.c \
                schedule.c network.c control.c
 
-TGT_PREREQS    := libfreeradius-util.la
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-util.la
 TGT_LDLIBS     := $(LIBS)
 TGT_LDFLAGS    := $(LDFLAGS)
 

diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index 147b09faac285ba764c5f6edf119199d4e4a26db..6d45da84f452f4937c56899151664e2517c94161 100644 (file)
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -268,4 +268,15 @@ void **talloc_array_null_strip(void **array)
        return new;
 }
 
+/** Free const'd memory
+ *
+ * @param[in] ptr      to free.
+ */
+void talloc_const_free(void const *ptr)
+{
+       void *tmp;
+       if (!ptr) return;
 
+       memcpy(&tmp, &ptr, sizeof(tmp));
+       talloc_free(tmp);
+}

diff --git a/src/main/util.c b/src/main/util.c
index b60d1628bdcb630b1e5cffed3b1785add8d368e6..3d86329ef1d2fa41060be1aa65edcb7e733a7c70 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -405,15 +405,6 @@ ssize_t rad_filename_unescape(char *out, size_t outlen, char const *in, size_t i
        return outlen - freespace;      /* how many bytes were written */
 }
 
-void talloc_const_free(void const *ptr)
-{
-       void *tmp;
-       if (!ptr) return;
-
-       memcpy(&tmp, &ptr, sizeof(tmp));
-       talloc_free(tmp);
-}
-
 /** talloc a buffer to hold the concatenated value of all elements of argv
  *
  * @param ctx to allocate buffer in.

diff --git a/src/modules/proto_detail/proto_detail.mk b/src/modules/proto_detail/proto_detail.mk
index 249e04c0039ea3d55843deab92da78d26eea44c5..27102b37a5a2cb559e4fa13571ea8b1d55724578 100644 (file)
--- a/src/modules/proto_detail/proto_detail.mk
+++ b/src/modules/proto_detail/proto_detail.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES                := proto_detail.c
 
-TGT_PREREQS    := libfreeradius-util.a libfreeradius-io.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-io.a

diff --git a/src/modules/proto_radius/proto_radius.mk b/src/modules/proto_radius/proto_radius.mk
index 17ec3a8f0e83854daf8935c1a3ff265ab9138b15..5c1f3de0672d66dfd884c527aab55a0d4056400c 100644 (file)
--- a/src/modules/proto_radius/proto_radius.mk
+++ b/src/modules/proto_radius/proto_radius.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES                := proto_radius.c
 
-TGT_PREREQS    := libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a

diff --git a/src/modules/proto_vmps/proto_vmps.mk b/src/modules/proto_vmps/proto_vmps.mk
index 129417624706ec344836d17c98826a9221e2343f..f1a5fa2cb6cd8904a9cecb50688fc7a26e0c8df0 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps.mk
+++ b/src/modules/proto_vmps/proto_vmps.mk
@@ -6,4 +6,4 @@ endif
 
 SOURCES                := proto_vmps.c
 
-TGT_PREREQS    := libfreeradius-util.a libfreeradius-radius.a libfreeradius-vqp.a libfreeradius-io.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-util.a libfreeradius-radius.a libfreeradius-vqp.a libfreeradius-io.a

diff --git a/src/protocols/ethernet/all.mk b/src/protocols/ethernet/all.mk
index ff088397113c917c2497649bf3f4d0aae9e1ae8f..b180ae08f1cf97a538b39399be0322f281669e85 100644 (file)
--- a/src/protocols/ethernet/all.mk
+++ b/src/protocols/ethernet/all.mk
@@ -7,4 +7,4 @@ TARGET          := libfreeradius-ethernet.a
 
 SOURCES                := ethernet.c
 
-TGT_PREREQS    := libfreeradius-util.a libfreeradius-io.a
+TGT_PREREQS    := $(LIBFREERADIUS_SERVER) libfreeradius-io.a libfreeradius-util.a