Update documentation/help with the correct "--os" names

This should probably be updated on Transifex too, as the old help text
incorrectly specified "mac".

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>

auth.c

@@ -796,7 +796,7 @@ void free_auth_form(struct oc_auth_form *form)
  *
  * <config-auth client="vpn" type="<!-- init or auth-reply -->">
  *   <version who="vpn"><!-- currently just the OpenConnect version --></version>
- *   <device-id><!-- linux, linux-64, mac, win --></device-id>
+ *   <device-id><!-- linux, linux-64, win, ... --></device-id>
  *   <opaque is-for="<!-- some name -->">
  *     <!-- just copy this verbatim from whatever the gateway sent us -->
  *   </opaque>

main.c

@@ -316,7 +316,7 @@ static void usage(void)
 	printf("      --reconnect-timeout         %s\n", _("Connection retry timeout in seconds"));
 	printf("      --servercert=FINGERPRINT    %s\n", _("Server's certificate SHA1 fingerprint"));
 	printf("      --useragent=STRING          %s\n", _("HTTP header User-Agent: field"));
-	printf("      --os=STRING                 %s\n", _("OS type (linux,linux-64,mac,win) to report"));
+	printf("      --os=STRING                 %s\n", _("OS type (linux,linux-64,win,...) to report"));
 	printf("      --dtls-local-port=PORT      %s\n", _("Set local port for DTLS datagrams"));
 	printf("\n");
 

openconnect.8.in

@@ -386,9 +386,18 @@ as 'User\-Agent:' field value in HTTP header.
 (e.g. \-\-useragent 'Cisco AnyConnect VPN Agent for Windows 2.2.0133')
 .TP
 .B \-\-os=STRING
-OS type to report to gateway.  Recognized values are: linux, linux-64, mac,
-win.  Reporting a different OS type may affect the security policy applied
-to the VPN session.
+OS type to report to gateway.  Recognized values are:
+.BR linux ,
+.BR linux\-64 ,
+.BR win ,
+.BR mac\-intel ,
+.BR android ,
+.BR apple\-ios .
+Reporting a different OS type may affect the dynamic access policy (DAP)
+applied to the VPN session.  If the gateway requires CSD, it will also cause
+the corresponding CSD trojan binary to be downloaded, so you may need to use
+.B \-\-csd\-wrapper
+if this code is not executable on the local machine.
 .SH LIMITATIONS
 Note that although IPv6 has been tested on all platforms on which
 .B openconnect

openconnect.h

@@ -270,7 +270,12 @@ void openconnect_set_xmlsha1(struct openconnect_info *, const char *, int size);
 void openconnect_set_cafile(struct openconnect_info *, char *);
 void openconnect_setup_csd(struct openconnect_info *, uid_t, int silent, char *wrapper);
 void openconnect_set_xmlpost(struct openconnect_info *, int enable);
+
+/* Valid choices are: "linux", "linux-64", "win", "mac-intel",
+   "android", and "apple-ios". This also selects the corresponding CSD
+   trojan binary. */
 int openconnect_set_reported_os(struct openconnect_info *, const char *os);
+
 void openconnect_set_mobile_info(struct openconnect_info *vpninfo,
 				 char *mobile_platform_version,
 				 char *mobile_device_type,