Change csd user option name

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/http.c b/http.c
index be0ea98..7154fac 100644 (file)
--- a/http.c
+++ b/http.c
@@ -312,8 +312,8 @@ static int run_csd_script(struct openconnect_info *vpninfo, char *buf, int bufle
 
        if (!vpninfo->uid_csd_given) {
                vpninfo->progress(vpninfo, PRG_ERR, "Error: You are trying to "
-                                 "run unsecure CSD code without specifying the CSD user.\n"
-                                 "       Use command line option \"--setuid-csd\"\n");
+                                 "run insecure CSD code without specifying the CSD user.\n"
+                                 "       Use command line option \"--csd-user\"\n");
                exit(1);
        }
 
@@ -352,9 +352,9 @@ static int run_csd_script(struct openconnect_info *vpninfo, char *buf, int bufle
                        chdir(pw->pw_dir);
                }
                if (vpninfo->uid_csd == 0) {
-                       fprintf(stderr, "Warning: you are running unsecure "
+                       fprintf(stderr, "Warning: you are running insecure "
                                "CSD code with root privileges\n"
-                               "\t Use command line option \"--setuid-csd\"\n");
+                               "\t Use command line option \"--csd-user\"\n");
                }
 
                csd_argv[i++] = fname;

diff --git a/main.c b/main.c
index 3a083a4..a170ece 100644 (file)
--- a/main.c
+++ b/main.c
@@ -87,7 +87,7 @@ static struct option long_options[] = {
        {"servercert", 1, 0, 0x01},
        {"key-password-from-fsid", 0, 0, 0x02},
        {"useragent", 1, 0, 0x03},
-       {"setuid-csd", 1, 0, 0x04},
+       {"csd-user", 1, 0, 0x04},
        {"disable-ipv6", 0, 0, 0x05},
        {NULL, 0, 0, 0},
 };
@@ -109,7 +109,7 @@ void usage(void)
        printf("  -i, --interface=IFNAME          Use IFNAME for tunnel interface\n");
        printf("  -l, --syslog                    Use syslog for progress messages\n");
        printf("  -U, --setuid=USER               Drop privileges after connecting\n");
-       printf("      --setuid-csd=USER           Drop privileges during CSD execution\n");
+       printf("      --csd-user=USER           Drop privileges during CSD execution\n");
        printf("  -m, --mtu=MTU                   Request MTU from server\n");
        printf("  -p, --key-password=PASS         Set key passphrase or TPM SRK PIN\n");
        printf("      --key-password-from-fsid    Key passphrase is fsid of file system\n");

diff --git a/openconnect.8 b/openconnect.8
index ac7dd6b..a99eb6a 100644 (file)
--- a/openconnect.8
+++ b/openconnect.8
@@ -50,7 +50,7 @@ openconnect \- Connect to Cisco AnyConnect VPN
 .I USER
 ]
 [
-.B --setuid-csd
+.B --csd-user
 .I USER
 ]
 [
@@ -209,7 +209,7 @@ Use syslog for progress messages
 Drop privileges after connecting, to become user
 .I USER
 .TP
-.B --setuid-csd=USER
+.B --csd-user=USER
 Drop privileges during CSD (Cisco Secure Desktop) script execution. This
 option is required when connecting to a server with CSD.
 .TP