diff options
| author | Adam <Adam@anope.org> | 2011-04-27 22:51:55 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-05-16 04:09:07 -0400 |
| commit | 8fb1604f649bec6f356770daf5df6bb8ab811bbf (patch) | |
| tree | 75ddfc26592a6357666e3f48fcb8cd20c693792b /src | |
| parent | 284af258bf3c4dc7f409722d66bb0ac59e01e37d (diff) | |
Fixed reading empty config values in the multiconfig code, caused by removal of DT_CHARPTR
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.cpp | 25 | ||||
| -rw-r--r-- | src/nickalias.cpp | 2 |
2 files changed, 8 insertions, 19 deletions
diff --git a/src/config.cpp b/src/config.cpp index dce6594b6..0ce28d34e 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1247,7 +1247,7 @@ void ServerConfig::Read() if (ConfValue(hash, configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum], configitems.MultiValues[Index].items_default[valuenum], tagnum, item, allow_newlines)) vl.push_back(ValueItem(item)); else - vl.push_back(ValueItem("")); + vl.push_back(ValueItem()); ValidateNoSpaces(vl[vl.size() - 1].GetValue(), configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum]); break; } @@ -1257,7 +1257,7 @@ void ServerConfig::Read() if (ConfValue(hash, configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum], configitems.MultiValues[Index].items_default[valuenum], tagnum, item, allow_newlines)) vl.push_back(ValueItem(item)); else - vl.push_back(ValueItem("")); + vl.push_back(ValueItem()); ValidateHostname(vl[vl.size() - 1].GetValue(), configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum]); break; } @@ -1267,7 +1267,7 @@ void ServerConfig::Read() if (ConfValue(hash, configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum], configitems.MultiValues[Index].items_default[valuenum], tagnum, item, allow_newlines)) vl.push_back(ValueItem(item)); else - vl.push_back(ValueItem("")); + vl.push_back(ValueItem()); ValidateIP(vl[vl.size() - 1].GetValue(), configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum], allow_wild); break; } @@ -1277,7 +1277,7 @@ void ServerConfig::Read() if (ConfValue(hash, configitems.MultiValues[Index].tag, configitems.MultiValues[Index].items[valuenum], configitems.MultiValues[Index].items_default[valuenum], tagnum, item, allow_newlines)) vl.push_back(ValueItem(item)); else - vl.push_back(ValueItem("")); + vl.push_back(ValueItem()); break; } case DT_INTEGER: @@ -1734,6 +1734,8 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const Anope::string &tag, return 0; } +ValueItem::ValueItem() { } + ValueItem::ValueItem(int value) : v("") { std::stringstream n; @@ -1757,21 +1759,6 @@ ValueItem::ValueItem(bool value) : v("") ValueItem::ValueItem(const Anope::string &value) : v(value) { } -void ValueItem::Set(const char *value) -{ - v = value; -} - -void ValueItem::Set(const std::string &value) -{ - v = value; -} - -void ValueItem::Set(const ci::string &value) -{ - v = value; -} - void ValueItem::Set(const Anope::string &value) { v = value; diff --git a/src/nickalias.cpp b/src/nickalias.cpp index 019c54615..c31d98129 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -25,6 +25,8 @@ NickAlias::NickAlias(const Anope::string &nickname, NickCore *nickcore) : Flags< if (o == NULL) o = Oper::Find(this->nc->display); this->nc->o = o; + if (this->nc->o != NULL) + Log() << "Tied oper " << this->nc->display << " to type " << this->nc->o->ot->GetName(); } } |