maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unimplemented -A option.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-22 15:47:13 -07:00
parent 9b89c2a3b5
commit 98dd9d2c69
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/guacd/daemon.c
View File

@ -375,7 +375,7 @@ int main(int argc, char* argv[]) {
int retval; int retval;
/* Parse arguments */ /* 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') { if (opt == 'l') {
listen_port = strdup(optarg); listen_port = strdup(optarg);
} }
@ -395,12 +395,8 @@ int main(int argc, char* argv[]) {
else if (opt == 'K') { else if (opt == 'K') {
key_file = strdup(optarg); key_file = strdup(optarg);
} }
else if (opt == 'A') {
fprintf(stderr, "The -a option is not yet implemented.\n");
exit(EXIT_FAILURE);
}
#else #else
else if (opt == 'C' || opt == 'K' || opt == 'A') { else if (opt == 'C' || opt == 'K') {
fprintf(stderr, fprintf(stderr,
"This %s does not have SSL/TLS support compiled in.\n" "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 " "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 #ifdef ENABLE_SSL
" [-C CERTIFICATE_FILE]" " [-C CERTIFICATE_FILE]"
" [-K PEM_FILE]" " [-K PEM_FILE]"
" [-A CIPHER1:CIPHER2:...]"
#endif #endif
" [-f]\n", argv[0]); " [-f]\n", argv[0]);

7
src/guacd/man/guacd.8
View File

@ -10,7 +10,6 @@ guacd \- Guacamole proxy daemon
[\fB-p\fR \fIPID FILE\fR] [\fB-p\fR \fIPID FILE\fR]
[\fB-C\fR \fICERTIFICATE FILE\fR] [\fB-C\fR \fICERTIFICATE FILE\fR]
[\fB-K\fR \fIKEY FILE\fR] [\fB-K\fR \fIKEY FILE\fR]
[\fB-A\fR \fICIPHER1:CIPHER2:...\fR]
[\fB-f\fR] [\fB-f\fR]
. .
.SH DESCRIPTION .SH DESCRIPTION
@ -70,12 +69,6 @@ this instance of
.B guacd .B guacd
will require SSL/TLS enabled in the client (the web application). If will require SSL/TLS enabled in the client (the web application). If
this option is not given, communication with guacd must be unencrypted. 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 .SH AUTHOR
Written by Michael Jumper <mike.jumper@guac-dev.org> Written by Michael Jumper <mike.jumper@guac-dev.org>