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

GUACAMOLE-351: Add "-v" option which causes guacd to print its version information and exit.

Browse Source
This commit is contained in:
Michael Jumper 2018-02-07 13:41:22 -08:00
parent f4f5b4e65a
commit 3b327378eb
5 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/guacd/conf-args.c
View File

@ -32,7 +32,7 @@ int guacd_conf_parse_args(guacd_config* config, int argc, char** argv) {
/* Parse arguments */
int opt;
while ((opt = getopt(argc, argv, "l:b:p:L:C:K:f")) != -1) {
while ((opt = getopt(argc, argv, "l:b:p:L:C:K:fv")) != -1) {
/* -l: Bind port */
if (opt == 'l') {
@ -51,6 +51,11 @@ int guacd_conf_parse_args(guacd_config* config, int argc, char** argv) {
config->foreground = 1;
}
/* -v: Print version and exit */
else if (opt == 'v') {
config->print_version = 1;
}
/* -p: PID file */
else if (opt == 'p') {
free(config->pidfile);
@ -105,7 +110,8 @@ int guacd_conf_parse_args(guacd_config* config, int argc, char** argv) {
" [-C CERTIFICATE_FILE]"
" [-K PEM_FILE]"
#endif
" [-f]\n", argv[0]);
" [-f]"
" [-v]\n", argv[0]);
return 1;
}

1
src/guacd/conf-file.c
View File

@ -180,6 +180,7 @@ guacd_config* guacd_conf_load() {
conf->bind_port = strdup("4822");
conf->pidfile = NULL;
conf->foreground = 0;
conf->print_version = 0;
conf->max_log_level = GUAC_LOG_INFO;
#ifdef ENABLE_SSL

5
src/guacd/conf.h
View File

@ -49,6 +49,11 @@ typedef struct guacd_config {
*/
int foreground;
/**
* Whether guacd should simply print its version information and exit.
*/
int print_version;
#ifdef ENABLE_SSL
/**
* SSL certificate file.

7
src/guacd/daemon.c
View File

@ -280,6 +280,13 @@ int main(int argc, char* argv[]) {
if (config == NULL || guacd_conf_parse_args(config, argc, argv))
exit(EXIT_FAILURE);
/* If requested, simply print version and exit, without initializing the
* logging system, etc. */
if (config->print_version) {
printf("Guacamole proxy daemon (guacd) version " VERSION "\n");
exit(EXIT_SUCCESS);
}
/* Init logging as early as possible */
guacd_log_level = config->max_log_level;
openlog(GUACD_LOG_NAME, LOG_PID, LOG_DAEMON);

6
src/guacd/man/guacd.8.in
View File

@ -30,6 +30,7 @@ guacd \- Guacamole proxy daemon
[\fB-C\fR \fICERTIFICATE FILE\fR]
[\fB-K\fR \fIKEY FILE\fR]
[\fB-f\fR]
[\fB-v\fR]
.
.SH DESCRIPTION
.B guacd
@ -80,6 +81,11 @@ Causes
.B guacd
to run in the foreground, rather than automatically forking into the
background.
.TP
\fB\-v\fR
Causes
.B guacd
to simply print its version information and exit.
.
.SH SSL/TLS OPTIONS
If libssl was present at the time