Merge config aliasing bug fix.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 754290223170c56654d66a7bb07ed08202c1ef0d..4cb56774671ebeec323d4069d6528bb1d75a919f 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -155,7 +155,7 @@ struct config {
   long prefsync;                       /* preflog sync interval */
 
   /** @brief Secondary listen address */
   long prefsync;                       /* preflog sync interval */
 
   /** @brief Secondary listen address */

-  struct stringlist listen;
+  struct netaddress listen;

 
   /** @brief Alias format string */
   const char *alias;
 
   /** @brief Alias format string */
   const char *alias;


@@ -194,7 +194,7 @@ struct config {
   const char *password;
 
   /** @brief Address to connect to */
   const char *password;
 
   /** @brief Address to connect to */

-  struct stringlist connect;
+  struct netaddress connect;

 
   /** @brief Directories to search for web templates */
   struct stringlist templates;
 
   /** @brief Directories to search for web templates */
   struct stringlist templates;