X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/76e72f65da97e7482da0a1eb0b110ca323f21643..e2daf70b506edb51fa81a003c9794120f2769672:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 7542902..875b9d6 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -70,7 +70,8 @@ struct collectionlist {
 
 struct namepart {
   char *part;				/* part */
-  pcre *re;				/* regexp */
+  pcre *re;				/* compiled regexp */
+  char *res;                            /* regexp as a string */
   char *replace;			/* replacement string */
   char *context;			/* context glob */
   unsigned reflags;			/* regexp flags */
@@ -155,7 +156,7 @@ struct config {
   long prefsync;			/* preflog sync interval */
 
   /** @brief Secondary listen address */
-  struct stringlist listen;
+  struct netaddress listen;
 
   /** @brief Alias format string */
   const char *alias;
@@ -194,7 +195,7 @@ struct config {
   const char *password;
 
   /** @brief Address to connect to */
-  struct stringlist connect;
+  struct netaddress connect;
 
   /** @brief Directories to search for web templates */
   struct stringlist templates;
@@ -292,7 +293,8 @@ struct config {
 extern struct config *config;
 /* the current configuration */
 
-int config_read(int server);
+int config_read(int server,
+                const struct config *oldconfig);
 /* re-read config, return 0 on success or non-0 on error.
  * Only updates @config@ if the new configuration is valid. */