GUACAMOLE-478: Merge add clipboard line ending normalization option for RDP.

diff --git a/src/guacd/conf-file.c b/src/guacd/conf-file.c
index 460ec95..1f1e566 100644
--- a/src/guacd/conf-file.c
+++ b/src/guacd/conf-file.c
@@ -176,8 +176,8 @@
         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;
diff --git a/src/guacd/conf.h b/src/guacd/conf.h
index f444cee..dd57173 100644
--- a/src/guacd/conf.h
+++ b/src/guacd/conf.h
@@ -25,6 +25,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.
  */
 typedef struct guacd_config {