X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/76e72f65da97e7482da0a1eb0b110ca323f21643..80dc2c5fd3ab604742d8a6bd5526071de41e44c3:/lib/configuration.c?ds=inline

diff --git a/lib/configuration.c b/lib/configuration.c
index 8ec79c7..5691e8a 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -854,24 +854,6 @@ static int validate_addrport(const struct config_state attribute((unused)) *cs,
   }
 }
 
-static int validate_port(const struct config_state attribute((unused)) *cs,
-			 int nvec,
-			 char attribute((unused)) **vec) {
-  switch(nvec) {
-  case 0:
-    error(0, "%s:%d: missing address",
-	  cs->path, cs->line);
-    return -1;
-  case 1:
-  case 2:
-    return 0;
-  default:
-    error(0, "%s:%d: expected [ADDRESS] PORT",
-	  cs->path, cs->line);
-    return -1;
-  }
-}
-
 static int validate_algo(const struct config_state attribute((unused)) *cs,
 			 int nvec,
 			 char **vec) {
@@ -960,7 +942,7 @@ static const struct conf conf[] = {
   { C(gap),              &type_integer,          validate_non_negative },
   { C(history),          &type_integer,          validate_positive },
   { C(home),             &type_string,           validate_isabspath },
-  { C(listen),           &type_stringlist,       validate_port },
+  { C(listen),           &type_netaddress,       validate_any },
   { C(lock),             &type_boolean,          validate_any },
   { C(mail_sender),      &type_string,           validate_any },
   { C(mixer),            &type_string,           validate_any },
@@ -1240,6 +1222,7 @@ static struct config *config_default(void) {
   }
   c->broadcast.af = -1;
   c->broadcast_from.af = -1;
+  c->listen.af = -1;
   return c;
 }