Fix some help text. Add authentication as a feature in --version.

Follow-up to #517.

src/iperf_locale.c

@@ -118,9 +118,10 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
                            "  -I, --pidfile file        write PID file\n"
                            "  -1, --one-off             handle one client connection then exit\n"
 #if defined(HAVE_SSL)
-                           "  --rsa-private-key-path    path to the RSA private key used to decrypt authentication credentials\n" 
-                           "  --authorized-users-path   path to the configuration file containing user credendial authorized to use iperf server\n"
-                           "                               file with username and password comma separated, one per line\n"
+                           "  --rsa-private-key-path    path to the RSA private key used to decrypt\n"
+			   "                            authentication credentials\n"
+                           "  --authorized-users-path   path to the configuration file containing user\n"
+                           "                            credentials\n"
 #endif //HAVE_SSL
                            "Client specific:\n"
                            "  -c, --client    <host>    run in client mode, connecting to <host>\n"
@@ -164,8 +165,9 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
                            "  --get-server-output       get results from server\n"
                            "  --udp-counters-64bit      use 64-bit counters in UDP test packets\n"
 #if defined(HAVE_SSL)
-                           "  --username                username to access to the server test\n"
-                           "  --rsa-public-key-path     path to the RSA public key used to encrypt authentication credentials\n" 
+                           "  --username                username for authentication\n"
+                           "  --rsa-public-key-path     path to the RSA public key used to encrypt\n"
+                           "                            authentication credentials\n"
 #endif //HAVESSL
     
 #ifdef NOT_YET_SUPPORTED /* still working on these */

src/iperf_util.c

@@ -1,5 +1,5 @@
 /*
- * iperf, Copyright (c) 2014, 2016, The Regents of the University of
+ * iperf, Copyright (c) 2014, 2016, 2017, The Regents of the University of
  * California, through Lawrence Berkeley National Laboratory (subject
  * to receipt of any required approvals from the U.S. Dept. of
  * Energy).  All rights reserved.
@@ -295,6 +295,16 @@ get_optional_features(void)
     numfeatures++;
 #endif /* HAVE_SO_MAX_PACING_RATE */
 
+#if defined(HAVE_SSL)
+    if (numfeatures > 0) {
+	strncat(features, ", ",
+		sizeof(features) - strlen(features) - 1);
+    }
+    strncat(features, "authentication",
+	sizeof(features) - strlen(features) - 1);
+    numfeatures++;
+#endif /* HAVE_SSL */
+
     if (numfeatures == 0) {
 	strncat(features, "None", 
 		sizeof(features) - strlen(features) - 1);