Merge 1.4.0 changes back to master.
This commit is contained in:
commit
27db57f704
@ -176,8 +176,8 @@ guacd_config* guacd_conf_load() {
|
||||
return NULL;
|
||||
|
||||
/* Load defaults */
|
||||
conf->bind_host = NULL;
|
||||
conf->bind_port = strdup("4822");
|
||||
conf->bind_host = strdup(GUACD_DEFAULT_BIND_HOST);
|
||||
conf->bind_port = strdup(GUACD_DEFAULT_BIND_PORT);
|
||||
conf->pidfile = NULL;
|
||||
conf->foreground = 0;
|
||||
conf->print_version = 0;
|
||||
|
@ -24,6 +24,18 @@
|
||||
|
||||
#include <guacamole/client.h>
|
||||
|
||||
/**
|
||||
* The default host that guacd should bind to, if no other host is explicitly
|
||||
* specified.
|
||||
*/
|
||||
#define GUACD_DEFAULT_BIND_HOST "localhost"
|
||||
|
||||
/**
|
||||
* The default port that guacd should bind to, if no other port is explicitly
|
||||
* specified.
|
||||
*/
|
||||
#define GUACD_DEFAULT_BIND_PORT "4822"
|
||||
|
||||
/**
|
||||
* The contents of a guacd configuration file.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user