* Ported [2456] to 1.2.9

svn: 2603

doc/UPDATES

@@ -30,6 +30,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed cmdpass list getting desynced during userfile transfer. (#143)
 * Removed old compatability code for converting CONFIG->SET during userfile loading.
 * Fixed "un-allocated socket" errors when a relay fails.
+* Fixed var 'server-port' not being used correctly. (Now lists/saves/loads before servers)
 
 1.2.8
 * Fixed [bot]* cmds depending on case of botnicks.

src/set.c

@@ -87,9 +87,9 @@ static variable_t vars[] = {
  VAR("process-list",	process_list,		sizeof(process_list),		VAR_STRING|VAR_LIST),
  VAR("promisc",		&promisc,		0,				VAR_INT|VAR_DETECTED),
  VAR("realname",	botrealname,		sizeof(botrealname),		VAR_STRING|VAR_NOLHUB),
+ VAR("server-port",	&default_port,		0,				VAR_INT|VAR_NOLHUB),
  VAR("servers",		&serverlist,		0,				VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB),
  VAR("servers6",	&serverlist,		0,				VAR_SERVERS|VAR_LIST|VAR_SHUFFLE|VAR_NOLHUB),
- VAR("server-port",	&default_port,		0,				VAR_INT|VAR_NOLHUB),
  VAR("trace",		&trace,			0,				VAR_INT|VAR_DETECTED),
  {NULL,			NULL,			0,				0, NULL, NULL, 0}
 };