pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-25 08:56:39 +02:00
Code Activity

Process defines even before includes, fixes defining{} pseudoclient names to something else in their respective configurations

Browse Source
This commit is contained in:
Adam
2012-04-27 16:05:49 -04:00
parent 5068483cb9
commit e490a5461f
8 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/botserv.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
data/chanserv.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
data/global.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
data/hostserv.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
data/memoserv.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
data/nickserv.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
data/operserv.example.conf
+1
View File
@@ -4,6 +4,7 @@
/*
* First, create the service.
* Note that an easy way to rename this service is to define{} the client name to something else.
*/
service
{
src/config.cpp
+5 -5
View File
@@ -1284,11 +1284,6 @@ ConfigItems::ConfigItems(ServerConfig *conf)
/* These tags can occur multiple times, and therefore they have special code to read them
* which is different to the code for reading the singular tags listed above. */
MultiItem MultiItems[] = {
{"define",
{"name", "value", ""},
{"", "", ""},
{DT_STRING, DT_STRING},
InitDefine, DoDefine, DoneDefine},
/* Include must be first so we can pull in the extra files before processing
* anything else! */
{"include",
@@ -1296,6 +1291,11 @@ ConfigItems::ConfigItems(ServerConfig *conf)
{"", "", ""},
{DT_STRING, DT_STRING},
InitInclude, DoInclude, DoneInclude},
{"define",
{"name", "value", ""},
{"", "", ""},
{DT_STRING, DT_STRING},
InitDefine, DoDefine, DoneDefine},
{"uplink",
{"host", "ipv6", "port", "password", ""},
{"", "no", "0", "", ""},