remove 'login' and 'password' from client definition

diff --git a/raddb/clients.conf b/raddb/clients.conf
index 8e4f1cb0bf70d274680fff338b8bcf56599a2ef8..95bae930e1ed4801049f30515ec4253430de1ecb 100644 (file)
--- a/raddb/clients.conf
+++ b/raddb/clients.conf
@@ -147,15 +147,6 @@ client localhost {
        #
        nas_type         = other        # localhost isn't usually a NAS...
 
-       #
-       #  The following two configurations are for future use.
-       #  The 'naspasswd' file is currently used to store the NAS
-       #  login name and password, which is used by checkrad.pl
-       #  when querying the NAS for simultaneous use.
-       #
-#      login      = !root
-#      password        = someadminpas
-
        #
        #  As of 2.0, clients can also be tied to a virtual server.
        #  This is done by setting the "virtual_server" configuration

diff --git a/src/include/clients.h b/src/include/clients.h
index 3c80a71372eff8dfd3b499c40cfc0cccdf0d9bb9..93be75342ae33b90e9e9cd8770920715c5eebd0c 100644 (file)
--- a/src/include/clients.h
+++ b/src/include/clients.h
@@ -46,9 +46,6 @@ typedef struct radclient {
 
        char const              *nas_type;              //!< Type of client (arbitrary).
 
-       char const              *login;                 //!< Username to use for simultaneous use checks.
-       char const              *password;              //!< Password to use for simultaneous use checks.
-
        char const              *server;                //!< Name of the virtual server client is associated with.
        CONF_SECTION            *server_cs;             //!< Virtual server that the client is associated with
 

diff --git a/src/main/client.c b/src/main/client.c
index ab9bf6556e41853b218db1be92aae0cd7bbe7350..e7a0b53469311d7ac5b91b94673ad3323224da0d 100644 (file)
--- a/src/main/client.c
+++ b/src/main/client.c
@@ -285,7 +285,7 @@ bool client_add(RADCLIENT_LIST *clients, RADCLIENT *client)
                    (old->ipaddr.prefix == client->ipaddr.prefix) &&
                    namecmp(longname) && namecmp(secret) &&
                    namecmp(shortname) && namecmp(nas_type) &&
-                   namecmp(login) && namecmp(password) && namecmp(server) &&
+                   namecmp(server) &&
 #ifdef WITH_DYNAMIC_CLIENTS
                    (old->lifetime == client->lifetime) &&
                    namecmp(client_server) &&
@@ -481,8 +481,6 @@ static const CONF_PARSER client_config[] = {
 
        { FR_CONF_OFFSET("nas_type", FR_TYPE_STRING, RADCLIENT, nas_type) },
 
-       { FR_CONF_OFFSET("login", FR_TYPE_STRING, RADCLIENT, login) },
-       { FR_CONF_OFFSET("password", FR_TYPE_STRING, RADCLIENT, password) },
        { FR_CONF_OFFSET("virtual_server", FR_TYPE_STRING, RADCLIENT, server) },
        { FR_CONF_OFFSET("response_window", FR_TYPE_TIMEVAL, RADCLIENT, response_window) },