From 98dd9d2c692dd3bff394489d254b4626eaa13171 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 22 Jul 2013 15:47:13 -0700
Subject: [PATCH] Remove unimplemented -A option.

---
 src/guacd/daemon.c    | 9 ++-------
 src/guacd/man/guacd.8 | 7 -------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c
index f48e6ef8..1fdaa02a 100644
--- a/src/guacd/daemon.c
+++ b/src/guacd/daemon.c
@@ -375,7 +375,7 @@ int main(int argc, char* argv[]) {
     int retval;
 
     /* Parse arguments */
-    while ((opt = getopt(argc, argv, "l:b:p:C:K:A:f")) != -1) {
+    while ((opt = getopt(argc, argv, "l:b:p:C:K:f")) != -1) {
         if (opt == 'l') {
             listen_port = strdup(optarg);
         }
@@ -395,12 +395,8 @@ int main(int argc, char* argv[]) {
         else if (opt == 'K') {
             key_file = strdup(optarg);
         }
-        else if (opt == 'A') {
-            fprintf(stderr, "The -a option is not yet implemented.\n");
-            exit(EXIT_FAILURE);
-        }
 #else
-        else if (opt == 'C' || opt == 'K' || opt == 'A') {
+        else if (opt == 'C' || opt == 'K') {
             fprintf(stderr,
                     "This %s does not have SSL/TLS support compiled in.\n"
                     "If you wish to enable support for the -%c option, please install libssl and "
@@ -418,7 +414,6 @@ int main(int argc, char* argv[]) {
 #ifdef ENABLE_SSL
                     " [-C CERTIFICATE_FILE]"
                     " [-K PEM_FILE]"
-                    " [-A CIPHER1:CIPHER2:...]"
 #endif
                     " [-f]\n", argv[0]);
 
diff --git a/src/guacd/man/guacd.8 b/src/guacd/man/guacd.8
index 357ce7ba..ca4b34c3 100644
--- a/src/guacd/man/guacd.8
+++ b/src/guacd/man/guacd.8
@@ -10,7 +10,6 @@ guacd \- Guacamole proxy daemon
 [\fB-p\fR \fIPID FILE\fR]
 [\fB-C\fR \fICERTIFICATE FILE\fR]
 [\fB-K\fR \fIKEY FILE\fR]
-[\fB-A\fR \fICIPHER1:CIPHER2:...\fR]
 [\fB-f\fR]
 .
 .SH DESCRIPTION
@@ -70,12 +69,6 @@ this instance of
 .B guacd
 will require SSL/TLS enabled in the client (the web application). If
 this option is not given, communication with guacd must be unencrypted.
-.TP
-\fB-A\fR \fICIPHER1:CIPHER2:...\fR
-Given a colon-delimited list of ciphers, this option selects which
-ciphers will be available for SSL/TLS connections. If this option is
-not given, and encryption is enabled, all ciphers will be available
-for use.
 .
 .SH AUTHOR
 Written by Michael Jumper <mike.jumper@guac-dev.org>