diff options
| author | aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-01-27 00:12:11 +0000 |
|---|---|---|
| committer | aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-01-27 00:12:11 +0000 |
| commit | 20bea3078d67a090ebcca64bf3cdbd7e6ab6adb6 (patch) | |
| tree | 154357b8fdc476393e110ac48686a1160b508058 /src/configreader.cpp | |
| parent | 5773bcf973708ee2d9b0eca42fd0f8076a93f4c9 (diff) | |
Change API OnOperCompare to OnPassCompare, password hashing is now available for <connect:allow>, <power die= restart=>, <title> (m_customtitle.so), <vhost> (m_vhost.so), this works the same was as for <oper>: load m_password_hash.so (after all hasher modules, of course), and add hash="md5/sha256/whatever" to the relevant tag. Also fix m_callerid.cpp crashing on unload.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8755 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/configreader.cpp')
| -rw-r--r-- | src/configreader.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 64ba689a7..a9c41be7b 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -575,6 +575,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) const char* parent = values[13].GetString(); int maxchans = values[14].GetInteger(); unsigned long limit = values[15].GetInteger(); + const char* hashtype = values[16].GetString(); /* * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes. @@ -619,7 +620,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) { if (*allow) { - ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans); + ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans); c->limit = limit; c->SetPort(port); conf->Classes.push_back(c); @@ -817,6 +818,7 @@ void ServerConfig::Read(bool bail, User* user, int pass) {"files", "rules", "", new ValueContainerChar (this->rules), DT_CHARPTR, ValidateRules}, {"power", "diepass", "", new ValueContainerChar (this->diepass), DT_CHARPTR, ValidateNotEmpty}, {"power", "pause", "", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation}, + {"power", "hash", "", new ValueContainerChar (this->powerhash), DT_CHARPTR, NoValidation}, {"power", "restartpass", "", new ValueContainerChar (this->restartpass), DT_CHARPTR, ValidateNotEmpty}, {"options", "prefixquit", "", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation}, {"options", "suffixquit", "", new ValueContainerChar (this->SuffixQuit), DT_CHARPTR, NoValidation}, @@ -867,17 +869,17 @@ void ServerConfig::Read(bool bail, User* user, int pass) {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", "threshold", "sendq", "recvq", "localmax", "globalmax", "port", - "name", "parent", "maxchans", "limit", + "name", "parent", "maxchans", "limit", "hash", NULL}, {"", "", "", "", "120", "", "", "", "", "3", "3", "0", - "", "", "0", "0", + "", "", "0", "0", "", NULL}, {DT_IPADDRESS|DT_ALLOW_WILD, DT_IPADDRESS|DT_ALLOW_WILD, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER}, + DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER, DT_CHARPTR}, InitConnect, DoConnect, DoneConnect}, {"uline", |