Removed support for old-style "clients" file, as it makes future

	work more difficult.

diff --git a/man/man5/clients.5 b/man/man5/clients.5
index 7015994..fdaf1df 100644 (file)
--- a/man/man5/clients.5
+++ b/man/man5/clients.5
@@ -1,31 +1,9 @@
-.TH CLIENTS 5 "16 March 2001"
+.TH CLIENTS 5 "22 August 2002"
 .SH NAME
-clients \- RADIUS clients file
+clients \- FreeRADIUS configuration file.
 .SH DESCRIPTION
-The \fIclients\fP file resides in the radius database directory,
-by default \fI/etc/raddb\fP. Its use is depreciated in favour of 
-\fIclients.conf\fP.
-
-Every line starting with a hash sign
-.RB (' # ')
-is treated as comment and ignored.
-.PP
-Each line of the file contains two white-space delimited fields.
-.IP client hostname
-The RADIUS clients hostname.  This may be a plain hostname, or a
-dotted-quad IP address.
-.IP secret
-This is the so-called "shared secret" that is held between a RADIUS
-server and client. It is used to encrypt passwords in RADIUS packets,
-and also for authentication. You need to configure the same secret
-on the client (terminal server) as in this file.
-.PP
-The
-.I clients
-file is read by \fBradiusd\fP on startup only.
-.SH FILES
-.I /etc/raddb/clients
+This configuration file is no longer used by the server, and will not
+be read by the server. See the "scripts/clients.pl" program for a way
+to migrate this file to the new format.
 .SH "SEE ALSO"
-.BR radiusd (8),
 .BR clients.conf (5)
-.BR naslist (5)

diff --git a/scripts/clients.pl b/scripts/clients.pl
new file mode 100755 (executable)
index 0000000..dc6aba5
--- /dev/null
+++ b/scripts/clients.pl
@@ -0,0 +1,32 @@
+#!/usr/bin/env perl
+#
+#  Convert old-style "clients" file to new "clients.conf" format.
+#
+#  Usage: clients.pl clients new-clients.conf
+#         The "new-clients.conf" will be over-written.
+#
+#
+#      $Id$
+#
+if ($#ARGV != 1) {
+    print "Usage: clients.pl clients new-clients.conf\n";
+    print "       The \"new-clients.conf\" will be created if it does not exist.\n";
+    print "       If it does exist, it will be over-written.";
+    exit(1);
+}
+
+$old = shift;
+$new = shift;
+
+open OLD, "< $old"or die "Failed to open $old: $!\n";
+open NEW, "> $new" or die "Failed to open $new: $!\n";
+
+while (<OLD>) {
+    next if (/^\s*\#/);
+
+    split;
+
+    print NEW "client $_[0] {\n";
+    print NEW "\tsecret = $_[1]\n";
+    print NEW "}\n";
+}

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index e612566..b03b176 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -378,7 +378,6 @@ RADCLIENT   *client_find(const RADCLIENT_LIST *clients,
                             const lrad_ipaddr_t *ipaddr);
 const char     *client_name(const RADCLIENT_LIST *clients,
                             const lrad_ipaddr_t *ipaddr);
-int            read_clients_file(RADCLIENT_LIST *clients, const char *file);
 RADCLIENT      *client_findbynumber(const RADCLIENT_LIST *clients,
                                     int number);
 RADCLIENT      *client_find_old(const lrad_ipaddr_t *ipaddr);

diff --git a/src/main/client.c b/src/main/client.c
index 5b35576..ef1b0ab 100644 (file)
--- a/src/main/client.c
+++ b/src/main/client.c
@@ -321,175 +321,6 @@ RADCLIENT *client_find_old(const lrad_ipaddr_t *ipaddr)
 
 
 /*
- *     Read the clients file.
- */
-int read_clients_file(RADCLIENT_LIST *clients, const char *file)
-{
-       FILE *fp;
-       RADCLIENT *c;
-       char buffer[256];
-       char hostnm[256];
-       char secret[256];
-       char shortnm[256];
-       int prefix = 0;
-       int lineno = 0;
-       char *p;
-       int got_clients = FALSE;
-
-       if ((fp = fopen(file, "r")) == NULL) {
-               /* The clients file is no longer required.  All configuration
-                  information is read from radiusd.conf and friends.  If
-                  clients exists it will be used, but if it doesn't no harm
-                  done. */
-               return 0;
-       }
-
-       while(fgets(buffer, 256, fp) != NULL) {
-               lineno++;
-               if (!feof(fp) && (strchr(buffer, '\n') == NULL)) {
-                       radlog(L_ERR, "%s[%d]: line too long", file, lineno);
-                       return -1;
-               }
-
-               /*
-                *      Skip whitespace.
-                */
-               p = buffer;
-               while (*p &&
-                               ((*p == ' ') || (*p == '\t')))
-                       p++;
-
-               /*
-                *      Skip comments and blank lines.
-                */
-               if ((*p == '#') || (*p == '\n') || (*p == '\r'))
-                       continue;
-
-               if (!getword(&p, hostnm, sizeof(hostnm)) ||
-                               !getword(&p, secret, sizeof(secret))) {
-                       radlog(L_ERR, "%s[%d]: unexpected end of line",
-                                       file, lineno);
-                       return -1;
-               }
-
-               (void)getword(&p, shortnm, sizeof(shortnm));
-
-               /*
-                *      Look for a mask in the hostname
-                */
-               p = strchr(hostnm, '/');
-
-               if (p) {
-                       *p = '\0';
-                       p++;
-
-                       prefix = atoi(p);
-                       if ((prefix < 0) || (prefix > 128)) {
-                               radlog(L_ERR, "%s[%d]: Invalid value '%s' for IP network mask.",
-                                      file, lineno, p);
-                               return -1;
-                       }
-               }
-
-               /*
-                *      It should be OK now, let's create the buffer.
-                */
-               got_clients = TRUE;
-               c = rad_malloc(sizeof(RADCLIENT));
-               memset(c, 0, sizeof(*c));
-
-               if (ip_hton(hostnm, AF_UNSPEC, &c->ipaddr) < 0) {
-                       radlog(L_CONS|L_ERR, "%s[%d]: Failed to look up hostname %s",
-                                       file, lineno, hostnm);
-                       return -1;
-               }
-               c->prefix = prefix;
-               c->secret = strdup(secret);
-               c->shortname = strdup(shortnm);
-
-               switch (c->ipaddr.af) {
-                       NAS *nas;
-               case AF_INET :
-                       if ((prefix < 0) || (prefix > 32)) {
-                               radlog(L_ERR, "%s[%d]: Invalid value '%s' for IP network mask.",
-                                      file, lineno, p);
-                               return -1;
-                       }
-
-                       if (prefix) {
-                               hostnm[strlen(hostnm)] = '/';
-                               /* Long Name includes prefix too */
-                               c->longname = strdup(hostnm);
-                       } else {
-
-                               /*
-                                * Only do DNS lookups for machines.  Just print
-                                * the network as the long name.
-                                */
-                               ip_ntoh(&c->ipaddr, buffer, sizeof(buffer));
-                               c->longname = strdup(buffer);
-
-                       }
-                       /*
-                        *      Pull information over from the NAS.
-                        */
-                       nas = nas_find(c->ipaddr.ipaddr.ip4addr.s_addr);
-                       if (nas) {
-                               /*
-                                *      No short name in the
-                                *      'clients' file, try
-                                *      copying one over from
-                                *      the 'naslist' file.
-                                */
-                               if (!c->shortname) {
-                                       c->shortname = strdup(nas->shortname);
-                               }
-                               
-                               /*
-                                *  Copy the nastype over, too.
-                                */
-                               c->nastype = strdup(nas->nastype);
-                       }
-                       break;
-
-               case AF_INET6 :
-                       if (prefix) {
-                               hostnm[strlen(hostnm)] = '/';
-                               c->longname = strdup(hostnm);
-                       } else {
-
-                               /*
-                                * Only do DNS lookups for machines.  Just print
-                                * the network as the long name.
-                                */
-                               ip_ntoh(&c->ipaddr, buffer, sizeof(buffer));
-                               c->longname = strdup(buffer);
-                       }
-                       /* TODO: NAS info as in IPv4 above */
-                       break;
-               default :
-                       break;
-               }
-
-               /*
-                *      Failed to add the client: ignore the error
-                *      and continue.
-                */
-               if (!client_add(clients, c)) {
-                       client_free(c);
-               }
-       }
-       fclose(fp);
-
-       if (got_clients) {
-               radlog(L_INFO, "Using deprecated clients file.  Support for this will go away soon.");
-       }
-
-       return 0;
-}
-
-
-/*
  *     Find the name of a client (prefer short name).
  */
 const char *client_name(const RADCLIENT_LIST *clients,

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index b8867d5..992d43c 100644 (file)
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -1076,16 +1076,6 @@ int read_mainconfig(int reload)
                }
 
                /*
-                *      Then add the old ones.
-                */
-               DEBUG2("read_config_files:  reading clients");
-               snprintf(buffer, sizeof(buffer), "%.200s/%.50s", radius_dir, RADIUS_CLIENTS);
-               if (read_clients_file(clients, buffer) < 0) {
-                       radlog(L_ERR|L_CONS, "Errors reading clients");
-                       return -1;
-               }
-
-               /*
                 *      Free the old trees AFTER replacing them with
                 *      the new ones...
                 */