diff options
| author | Adam <Adam@anope.org> | 2012-04-27 16:05:49 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-04-27 16:05:49 -0400 |
| commit | e490a5461fa6ffa0b8a727833d6fcb79eef0405a (patch) | |
| tree | e2f2cf9860e69bab515e52ef01182fb453dd19cc | |
| parent | 5068483cb917ba1c8ed3a0d20f7bfcb996f0aa3e (diff) | |
Process defines even before includes, fixes defining{} pseudoclient names to something else in their respective configurations
| -rw-r--r-- | data/botserv.example.conf | 1 | ||||
| -rw-r--r-- | data/chanserv.example.conf | 1 | ||||
| -rw-r--r-- | data/global.example.conf | 1 | ||||
| -rw-r--r-- | data/hostserv.example.conf | 1 | ||||
| -rw-r--r-- | data/memoserv.example.conf | 1 | ||||
| -rw-r--r-- | data/nickserv.example.conf | 1 | ||||
| -rw-r--r-- | data/operserv.example.conf | 1 | ||||
| -rw-r--r-- | src/config.cpp | 10 |
8 files changed, 12 insertions, 5 deletions
diff --git a/data/botserv.example.conf b/data/botserv.example.conf index 695e02c41..878e8cc40 100644 --- a/data/botserv.example.conf +++ b/data/botserv.example.conf @@ -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 { diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf index 312b10dca..4eaa51f6e 100644 --- a/data/chanserv.example.conf +++ b/data/chanserv.example.conf @@ -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 { diff --git a/data/global.example.conf b/data/global.example.conf index 234c86810..1b5ca9d31 100644 --- a/data/global.example.conf +++ b/data/global.example.conf @@ -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 { diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf index 4e54d43dd..d995b8642 100644 --- a/data/hostserv.example.conf +++ b/data/hostserv.example.conf @@ -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 { diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf index 5bf6a0d33..59e1c9507 100644 --- a/data/memoserv.example.conf +++ b/data/memoserv.example.conf @@ -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 { diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index 79edce175..dd9dc9b99 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -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 { diff --git a/data/operserv.example.conf b/data/operserv.example.conf index 08410eb1c..334d39a82 100644 --- a/data/operserv.example.conf +++ b/data/operserv.example.conf @@ -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 { diff --git a/src/config.cpp b/src/config.cpp index 24b9e13b6..51a930393 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -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", "", ""}, |