summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example_new.conf6
-rw-r--r--src/config.c1
2 files changed, 0 insertions, 7 deletions
diff --git a/data/example_new.conf b/data/example_new.conf
index 8e0f1601f..636b2a3c8 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -117,12 +117,6 @@ uplink
* Refer to your IRCd documentation for more information on link blocks.
*/
password = "mypassword"
-
- /*
- * What server ID to use for this connection?
- * NOTE: This should *only* be used for TS6/P10 IRCds.
- */
- sid = 00A
}
/*
diff --git a/src/config.c b/src/config.c
index a9a0b1d34..87bdfce24 100644
--- a/src/config.c
+++ b/src/config.c
@@ -601,7 +601,6 @@ int ServerConfig::Read(bool bail)
{"uplink", "host", "", new ValueContainerChar(&RemoteServer), DT_HOSTNAME | DT_NORELOAD, ValidateNotEmpty},
{"uplink", "port", "0", new ValueContainerInt(&RemotePort), DT_INTEGER | DT_NORELOAD, ValidatePort},
{"uplink", "password", "", new ValueContainerChar(&RemotePassword), DT_NOSPACES | DT_NORELOAD, ValidateNotEmpty},
- {"uplink", "sid", "", new ValueContainerChar(&TS6SID), DT_CHARPTR | DT_NORELOAD, NoValidation},
{"nickserv", "nick", "NickServ", new ValueContainerChar(&s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
{"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty},
{"nickserv", "database", "nick.db", new ValueContainerChar(&NickDBName), DT_CHARPTR, ValidateNotEmpty},