X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/80dc2c5fd3ab604742d8a6bd5526071de41e44c3..4b37a75e9cb89088451753c7467d1d1bcddd29e0:/lib/configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index 47856d7..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 */
@@ -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. */