rename for consistency

diff --git a/src/include/clients.h b/src/include/clients.h
index fc6034a2f5bee0caf1943f5bd955e45e552ddadd..ed1fca0cd289a05aedb4b824abae80a52291d7e5 100644 (file)
--- a/src/include/clients.h
+++ b/src/include/clients.h
@@ -43,7 +43,7 @@ typedef struct radclient {
 
        char const              *secret;                //!< Secret PSK.
 
-       bool                    message_authenticator;  //!< Require RADIUS message authenticator in requests.
+       bool                    require_ma;             //!< Require RADIUS message authenticator in requests.
 
        char const              *nas_type;              //!< Type of client (arbitrary).
 

diff --git a/src/main/client.c b/src/main/client.c
index 305871260ca349e758ac7d89c2bc265536a16e59..5f68f3990e2085b70e04f7447e515a6073029fed 100644 (file)
--- a/src/main/client.c
+++ b/src/main/client.c
@@ -328,7 +328,7 @@ check_list:
                    (old->coa_home_server == client->coa_home_server) &&
                    (old->coa_home_pool == client->coa_home_pool) &&
 #endif
-                   (old->message_authenticator == client->message_authenticator)) {
+                   (old->require_ma == client->require_ma)) {
                        WARN("Ignoring duplicate client %s", client->longname);
                        client_free(client);
                        return true;
@@ -512,7 +512,7 @@ static const CONF_PARSER client_config[] = {
 
        { "src_ipaddr", FR_CONF_POINTER(PW_TYPE_STRING, &cl_srcipaddr), NULL },
 
-       { "require_message_authenticator",  FR_CONF_OFFSET(PW_TYPE_BOOLEAN, RADCLIENT, message_authenticator), "no" },
+       { "require_message_authenticator",  FR_CONF_OFFSET(PW_TYPE_BOOLEAN, RADCLIENT, require_ma), "no" },
 
        { "secret", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_SECRET, RADCLIENT, secret), NULL },
        { "shortname", FR_CONF_OFFSET(PW_TYPE_STRING, RADCLIENT, shortname), NULL },
@@ -720,7 +720,7 @@ static const CONF_PARSER dynamic_config[] = {
        { "FreeRADIUS-Client-Src-IP-Address", FR_CONF_OFFSET(PW_TYPE_IPV4_ADDR, RADCLIENT, src_ipaddr), NULL },
        { "FreeRADIUS-Client-Src-IPv6-Address", FR_CONF_OFFSET(PW_TYPE_IPV6_ADDR, RADCLIENT, src_ipaddr), NULL },
 
-       { "FreeRADIUS-Client-Require-MA", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, RADCLIENT, message_authenticator), NULL },
+       { "FreeRADIUS-Client-Require-MA", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, RADCLIENT, require_ma), NULL },
 
        { "FreeRADIUS-Client-Secret",  FR_CONF_OFFSET(PW_TYPE_STRING, RADCLIENT, secret), "" },
        { "FreeRADIUS-Client-Shortname",  FR_CONF_OFFSET(PW_TYPE_STRING, RADCLIENT, shortname), "" },
@@ -1215,7 +1215,7 @@ RADCLIENT *client_afrom_query(TALLOC_CTX *ctx, char const *identifier, char cons
        if (shortname) c->shortname = talloc_typed_strdup(c, shortname);
        if (type) c->nas_type = talloc_typed_strdup(c, type);
        if (server) c->server = talloc_typed_strdup(c, server);
-       c->message_authenticator = require_ma;
+       c->require_ma = require_ma;
 
        return c;
 }

diff --git a/src/main/listen.c b/src/main/listen.c
index 0f8990a86dec7d38266d26825ed0513f90c9ad67..e9d62e5e5ca8180f43c9ba8eb285c1e7f44fd2bd 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -1668,7 +1668,7 @@ static int auth_socket_recv(rad_listen_t *listener)
         *      Now that we've sanity checked everything, receive the
         *      packet.
         */
-       packet = rad_recv(ctx, listener->fd, client->message_authenticator);
+       packet = rad_recv(ctx, listener->fd, client->require_ma);
        if (!packet) {
                FR_STATS_INC(auth, total_malformed_requests);
                if (DEBUG_ENABLED) ERROR("Receive - %s", fr_strerror());
@@ -2059,7 +2059,7 @@ static int coa_socket_recv(rad_listen_t *listener)
         *      Now that we've sanity checked everything, receive the
         *      packet.
         */
-       packet = rad_recv(ctx, listener->fd, client->message_authenticator);
+       packet = rad_recv(ctx, listener->fd, client->require_ma);
        if (!packet) {
                FR_STATS_INC(coa, total_malformed_requests);
                if (DEBUG_ENABLED) ERROR("Receive - %s", fr_strerror());