change <raddb> to <confdir> in help text

diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index 596b01a90f6891dd2f12b5f5a3e85d3087af7287..c51f23be3c91cb9cb2697b5810f294f2c322401a 100644 (file)
--- a/src/bin/radclient-ng.c
+++ b/src/bin/radclient-ng.c
@@ -167,7 +167,7 @@ static NEVER_RETURNS void usage(void)
        fprintf(stderr, "  -A <attribute>                    Use named 'attribute' to match CoA requests to packets.  Default is User-Name\n");
        fprintf(stderr, "  -C [<client_ip>:]<client_port>    Client source port and source IP address.  Port values may be 1..65535\n");
        fprintf(stderr, "  -c <count>                        Send each packet 'count' times.\n");
-       fprintf(stderr, "  -d <raddb>                        Set user dictionary directory (defaults to " CONFDIR ").\n");
+       fprintf(stderr, "  -d <confdir>                      Set user dictionary directory (defaults to " CONFDIR ").\n");
        fprintf(stderr, "  -D <dictdir>                      Set main dictionary directory (defaults to " DICTDIR ").\n");
        fprintf(stderr, "  -f <file>[:<file>]                Read packets from file, not stdin.\n");
        fprintf(stderr, "                                    If a second file is provided, it will be used to verify responses\n");

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 2c91500787877718de8426561f5c04cad928e702..f5402851fe2685af2c26e927d49f78cc32110c85 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -168,7 +168,7 @@ static NEVER_RETURNS void usage(void)
        fprintf(stderr, "  -b                                Mandate checks for Blast RADIUS issue (this is not set by default).\n");
        fprintf(stderr, "  -C [<client_ip>:]<client_port>    Client source port and source IP address.  Port values may be 1..65535\n");
        fprintf(stderr, "  -c <count>                        Send each packet 'count' times.\n");
-       fprintf(stderr, "  -d <raddb>                        Set user dictionary directory (defaults to " CONFDIR ").\n");
+       fprintf(stderr, "  -d <confdir>                      Set user dictionary directory (defaults to " CONFDIR ").\n");
        fprintf(stderr, "  -D <dictdir>                      Set main dictionary directory (defaults to " DICTDIR ").\n");
        fprintf(stderr, "  -f <request>[:<expected>][:<coa_reply>][:<coa_expected>]  Read packets from file, not stdin.\n");
        fprintf(stderr, "                                    If a second file is provided, it will be used to verify responses\n");

diff --git a/src/bin/radclient4 b/src/bin/radclient4
index 460f47f60fe12632c9b6fb18eab2cebe7d676342..80dee060473acf201e519ab167479351ed176ba2 100755 (executable)
--- a/src/bin/radclient4
+++ b/src/bin/radclient4
@@ -11,7 +11,7 @@ Usage: radclient4 [options] server[:port] <command> <secret>
   <command>              One of auth, acct, status, coa, disconnect or auto.
   -4                     Use IPv4 address of server
   -6                     Use IPv6 address of server.
-  -d <raddb>             Set user dictionary directory.
+  -d <confdir>           Set user dictionary directory.
   -D <dictdir>           Set main dictionary directory.
   -f <file>              Read packets from file, not stdin.
   -h                     Print usage help information.

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 743e112e9c83cd49132af5621ffac6d4f42e303a..c97844b7e3f41d4e49b3fdd52b318978c829d0d2 100644 (file)
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -1212,7 +1212,7 @@ static NEVER_RETURNS void usage(int status)
        fprintf(output, "Usage: %s [options]\n", program);
        fprintf(output, "Options:\n");
        fprintf(output, "  -C            Check configuration and exit.\n");
-       fprintf(stderr, "  -d <raddb>    Set configuration directory (defaults to " CONFDIR ").\n");
+       fprintf(stderr, "  -d <confdir>  Set configuration directory (defaults to " CONFDIR ").\n");
        fprintf(stderr, "  -D <dictdir>  Set main dictionary directory (defaults to " DICTDIR ").\n");
 #ifndef NDEBUG
        fprintf(output, "  -e <seconds>  Exit after the specified number of seconds.  Useful for diagnosing \"crash-on-exit\" issues.\n");

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 8c70e4e3b0974ff4bd6abbf13a653f03610c9a13..9b7c2802b1d748f07452a6e93b9044129d2c286a 100644 (file)
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -2274,7 +2274,7 @@ static NEVER_RETURNS void usage(int status)
        fprintf(output, "  -a                    List all interfaces available for capture.\n");
        fprintf(output, "  -c <count>            Number of packets to capture.\n");
        fprintf(output, "  -C <checksum_type>    Enable checksum validation. (Specify 'udp' or 'radius')\n");
-       fprintf(output, "  -d <raddb>            Set configuration directory (defaults to " CONFDIR ").\n");
+       fprintf(output, "  -d <confdir>          Set configuration directory (defaults to " CONFDIR ").\n");
        fprintf(output, "  -D <dictdir>          Set main dictionary directory (defaults to " DICTDIR ").\n");
        fprintf(output, "  -e <event>[,<event>]  Only log requests with these event flags.\n");
        fprintf(output, "                        Event may be one of the following:\n");

diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index a883459aacd81dbdc6cc161e74a0b7c4eecb3e3e..7c4d8c30880f0dfd3964d1fc923f0f85c5bb9e1c 100644 (file)
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -130,7 +130,7 @@ static NEVER_RETURNS void usage(void)
        fprintf(stderr, "  <command>              One of auth, acct, status, coa, disconnect or auto.\n");
        fprintf(stderr, "  -4                     Use IPv4 address of server\n");
        fprintf(stderr, "  -6                     Use IPv6 address of server.\n");
-       fprintf(stderr, "  -d <raddb>             Set user dictionary directory (defaults to " CONFDIR ").\n");
+       fprintf(stderr, "  -d <confdir>           Set user dictionary directory (defaults to " CONFDIR ").\n");
        fprintf(stderr, "  -D <dictdir>           Set main dictionary directory (defaults to " DICTDIR ").\n");
        fprintf(stderr, "  -h                     Print usage help information.\n");
        fprintf(stderr, "  -l <file>              Log output to file.\n");

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 3b5cdb364f715db346d9d9fdc890eaff58fc69db..d35155c4045b3312790d0b8a3b8d8b75cb026b91 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -4031,7 +4031,7 @@ static void usage(char const *name)
 {
        INFO("usage: %s [options] (-|<filename>[:<lines>] [ <filename>[:<lines>]])", name);
        INFO("options:");
-       INFO("  -d <raddb>         Set user dictionary path (defaults to " CONFDIR ").");
+       INFO("  -d <confdir>       Set user dictionary path (defaults to " CONFDIR ").");
        INFO("  -D <dictdir>       Set main dictionary path (defaults to " DICTDIR ").");
        INFO("  -x                 Debugging mode.");
        INFO("  -f                 Print features.");

diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c
index 5a5b20b83eed7d0e06e97679e7672af9ee163942..6f174ca81835937bf2f51aaa571cc3d1828e4114 100644 (file)
--- a/src/bin/unit_test_map.c
+++ b/src/bin/unit_test_map.c
@@ -59,7 +59,7 @@ fr_dict_autoload_t unit_test_module_dict[] = {
 static NEVER_RETURNS void usage(char *argv[])
 {
        fprintf(stderr, "usage: %s [OPTS] filename ...\n", argv[0]);
-       fprintf(stderr, "  -d <raddb>         Set user dictionary directory (defaults to " CONFDIR ").\n");
+       fprintf(stderr, "  -d <confdir>       Set user dictionary directory (defaults to " CONFDIR ").\n");
        fprintf(stderr, "  -D <dictdir>       Set main dictionary directory (defaults to " DICTDIR ").\n");
        fprintf(stderr, "  -x                 Debugging mode.\n");
        fprintf(stderr, "  -M                 Show program version information.\n");

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 789cb924cde4df3061763e9eef42c6481c76c9ac..771c1485ef0c2ef8cd0c5b33e91181ecd9e0632b 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -1354,7 +1354,7 @@ static NEVER_RETURNS void usage(main_config_t const *config, int status)
        fprintf(output, "Usage: %s [options]\n", config->name);
        fprintf(output, "Options:\n");
        fprintf(output, "  -c <count>         Run packets through the interpreter <count> times\n");
-       fprintf(output, "  -d <confdir>     Configuration files are in \"confdir/*\".\n");
+       fprintf(output, "  -d <confdir>       Configuration files are in \"confdir/*\".\n");
        fprintf(output, "  -D <dict_dir>      Dictionary files are in \"dict_dir/*\".\n");
        fprintf(output, "  -f <file>          Filter reply against attributes in 'file'.\n");
        fprintf(output, "  -h                 Print this help message.\n");

diff --git a/src/modules/rlm_tacacs/tacclient b/src/modules/rlm_tacacs/tacclient
index bfdca679985eb1bac1d2bfeb35a029a05595b6fe..8ac24593a2944873f80d97d7ded6720f6f3cce39 100755 (executable)
--- a/src/modules/rlm_tacacs/tacclient
+++ b/src/modules/rlm_tacacs/tacclient
@@ -11,7 +11,7 @@ Usage: tacclient [options] server[:port] <command> [secret]
   <command>              One of auth-start, auth-continue, autz, acct
   -4                     Use IPv4 address of server
   -6                     Use IPv6 address of server.
-  -d <raddb>             Set user dictionary directory.
+  -d <confdir>           Set configuration directory for local dictionaries.
   -D <dictdir>           Set main dictionary directory.
   -f <file>              Read packets from file, not stdin.
   -h                     Print usage help information.