From: Alan T. DeKok Date: Sun, 2 Aug 2020 02:18:01 +0000 (-0400) Subject: remove WITH_DYNAMIC_CLIENTS X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceabb9e7b4c06cbcd4a19dc111f6b235af80eadc;p=thirdparty%2Ffreeradius-server.git remove WITH_DYNAMIC_CLIENTS --- diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index c77a9cb895c..a2d0780fee8 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -2110,7 +2110,6 @@ INCLUDE_FILE_PATTERNS = *.h PREDEFINED = WITH_PROXY \ WITH_ACCOUNTING \ - WITH_DYNAMIC_CLIENTS \ WITH_STATS \ WITH_COA \ HAVE_JSON diff --git a/src/include/features-h b/src/include/features-h index 62ce14f23ea..5b95b47d17a 100644 --- a/src/include/features-h +++ b/src/include/features-h @@ -15,10 +15,6 @@ # define WITH_ACCOUNTING (1) #endif -#ifndef WITHOUT_DYNAMIC_CLIENTS -# define WITH_DYNAMIC_CLIENTS (1) -#endif - #ifndef WITHOUT_STATS # define WITH_STATS #endif diff --git a/src/lib/server/client.c b/src/lib/server/client.c index 9f2fd09c25c..bb30a220a46 100644 --- a/src/lib/server/client.c +++ b/src/lib/server/client.c @@ -339,7 +339,6 @@ bool client_add(RADCLIENT_LIST *clients, RADCLIENT *client) } -#ifdef WITH_DYNAMIC_CLIENTS void client_delete(RADCLIENT_LIST *clients, RADCLIENT *client) { #ifdef WITH_TRIE @@ -366,7 +365,6 @@ void client_delete(RADCLIENT_LIST *clients, RADCLIENT *client) (void) rbtree_deletebydata(clients->tree[client->ipaddr.prefix], client); #endif } -#endif RADCLIENT *client_findbynumber(UNUSED const RADCLIENT_LIST *clients, UNUSED int number) { @@ -593,7 +591,6 @@ RADCLIENT_LIST *client_list_parse_section(CONF_SECTION *section, int proto, TLS_ return clients; } -#ifdef WITH_DYNAMIC_CLIENTS /** Create a client CONF_SECTION using a mapping section to map values from a result set to client attributes * * If we hit a CONF_SECTION we recurse and process its CONF_PAIRS too. @@ -1113,5 +1110,3 @@ RADCLIENT *client_read(char const *filename, CONF_SECTION *server_cs, bool check return c; } -#endif - diff --git a/src/lib/server/client.h b/src/lib/server/client.h index 2872428ab22..172f5501c80 100644 --- a/src/lib/server/client.h +++ b/src/lib/server/client.h @@ -129,11 +129,9 @@ void client_free(RADCLIENT *client); bool client_add(RADCLIENT_LIST *clients, RADCLIENT *client); -#ifdef WITH_DYNAMIC_CLIENTS void client_delete(RADCLIENT_LIST *clients, RADCLIENT *client); RADCLIENT *client_afrom_request(TALLOC_CTX *ctx, REQUEST *request); -#endif int client_map_section(CONF_SECTION *out, CONF_SECTION const *map, client_value_cb_t func, void *data); diff --git a/src/lib/server/dependency.c b/src/lib/server/dependency.c index 596ee39a14b..0660d57ed38 100644 --- a/src/lib/server/dependency.c +++ b/src/lib/server/dependency.c @@ -379,14 +379,6 @@ void dependency_features_init(CONF_SECTION *cs) #endif ); - dependency_feature_add(cs, "dynamic-clients", -#ifdef WITH_DYNAMIC_CLIENTS - true -#else - false -#endif - ); - dependency_feature_add(cs, "proxy", #ifdef WITH_PROXY true