diff options
-rw-r--r-- | data/example.conf | 10 | ||||
-rw-r--r-- | include/extern.h | 2 | ||||
-rw-r--r-- | lang/cat.l | 2 | ||||
-rw-r--r-- | lang/de.l | 2 | ||||
-rw-r--r-- | lang/en_us.l | 2 | ||||
-rw-r--r-- | lang/es.l | 4 | ||||
-rw-r--r-- | lang/fr.l | 2 | ||||
-rw-r--r-- | lang/gr.l | 2 | ||||
-rw-r--r-- | lang/hun.l | 3 | ||||
-rw-r--r-- | lang/it.l | 2 | ||||
-rw-r--r-- | lang/nl.l | 3 | ||||
-rw-r--r-- | lang/pl.l | 4 | ||||
-rw-r--r-- | lang/pt.l | 2 | ||||
-rw-r--r-- | lang/ru.l | 2 | ||||
-rw-r--r-- | lang/tr.l | 2 | ||||
-rw-r--r-- | src/config.c | 5 |
16 files changed, 2 insertions, 47 deletions
diff --git a/data/example.conf b/data/example.conf index 5e3ed6e1c..57978509d 100644 --- a/data/example.conf +++ b/data/example.conf @@ -1220,13 +1220,6 @@ operserv #killonsqline = yes /* - * Disables the highly destructive OperServ RAW command. This directive is optional, but HIGHLY - * recommended. Not setting this and causing problems with your network using RAW will not be - * supported. - */ - disableraw = yes - - /* * Defines what actions should trigger notifications. The list must be separated by spaces. * * The notifications are: @@ -1242,7 +1235,6 @@ operserv * - osszline: OperServ's SZLINE command was used * - osnoop: OperServ's NOOP command was used * - osjupe: OperServ's JUPE command was used - * - osraw: OperServ's RAW command was used * - akillexpire: An AKILL has expired * - sglineexpire: An SGLINE has expired * - sqlineexpire: An SQLINE has expired @@ -1257,7 +1249,7 @@ operserv * * This directive is optional, if left blank, there will be no notifications. */ - notifications="osglobal osmode osclearmodes oskick osakill ossgline ossqline osszline osnoop osjupe osraw getpass setpass forbid drop" + notifications="osglobal osmode osclearmodes oskick osakill ossgline ossqline osszline osnoop osjupe getpass setpass forbid drop" /* * Enables session limiting. Session limiting prevents users from connecting more than a certain diff --git a/include/extern.h b/include/extern.h index 691342316..d826bd62e 100644 --- a/include/extern.h +++ b/include/extern.h @@ -367,7 +367,6 @@ E time_t SZLineExpiry; E bool AkillOnAdd; E bool KillonSGline; E bool KillonSQline; -E bool DisableRaw; E bool WallOper; E bool WallBadOS; E bool WallOSGlobal; @@ -380,7 +379,6 @@ E bool WallOSSQLine; E bool WallOSSZLine; E bool WallOSNoOp; E bool WallOSJupe; -E bool WallOSRaw; E bool WallAkillExpire; E bool WallSGLineExpire; E bool WallSQLineExpire; diff --git a/lang/cat.l b/lang/cat.l index a0a0c7cc8..661ca70c9 100644 --- a/lang/cat.l +++ b/lang/cat.l @@ -178,8 +178,6 @@ ACCESS_DENIED accés denegat. PERMISSION_DENIED Permis denegat. -RAW_DISABLED - The RAW option has been disabled. If you must use it, enable the DisableRaw directive in Services configuration. MORE_OBSCURE_PASSWORD Per favor intenti novamente amb una clau mes oculta. Les claus han de ser de com a mínim 5 caràcters, no han de ser fàcils d'encertar (ex. Nom real o Nick), i no poden contenir el caràcter d'espai o tabulació. @@ -196,8 +196,6 @@ ACCESS_DENIED Zugriff verweigert. PERMISSION_DENIED Berechtigung nicht ausreichend. -RAW_DISABLED - RAW wurde deaktiviert. Um RAW nutzen zu können, muss DisableRaw in der Services Config Datei deaktiviert werden. MORE_OBSCURE_PASSWORD Bitte versuche es nochmal mit einem besseren Passwort. diff --git a/lang/en_us.l b/lang/en_us.l index 798dcc2b0..240bd8255 100644 --- a/lang/en_us.l +++ b/lang/en_us.l @@ -177,8 +177,6 @@ ACCESS_DENIED Access denied. PERMISSION_DENIED Permission denied. -RAW_DISABLED - The RAW option has been disabled. If you must use it, configure the DisableRaw directive in Services configuration. MORE_OBSCURE_PASSWORD Please try again with a more obscure password. Passwords should be at least five characters long, should not be something easily guessed (e.g. your real name or your nick), and cannot contain the space or tab characters. @@ -177,10 +177,6 @@ ACCESS_DENIED Acceso denegado. PERMISSION_DENIED Permiso denegado. -RAW_DISABLED - La opcion RAW ha sido deshabilitada. Si necesitas usarla - debes habilitar la directiva DisableRaw en la configuracion - de los Servicios. MORE_OBSCURE_PASSWORD Por favor intente nuevamente con una clave mas oscura. @@ -183,8 +183,6 @@ ACCESS_DENIED Accès refusé. PERMISSION_DENIED Permission refusée. -RAW_DISABLED - L'option RAW n'est pas active. Si vous voulez l'utiliser, desactiver l'option DisableRaw dans la configuration des services. MORE_OBSCURE_PASSWORD Veuillez réessayer avec un mot de passe plus difficile à trouver. Les mots de passe doivent contenir au moins cinq caractères, ne doivent pas être trop facilement devinables (par exemple votre vrai nom ou votre pseudo), et ne doit pas contenir d'espaces ou de tabulations. @@ -177,8 +177,6 @@ ACCESS_DENIED Äåí Ý÷åéò ôçí åðéôñåðüìåíç Üäåéá. PERMISSION_DENIED Äåí Ý÷åéò Üäåéá. -RAW_DISABLED - The RAW option has been disabled. If you must use it, enable the DisableRaw directive in Services configuration. MORE_OBSCURE_PASSWORD Ðáñáêáëþ ðñïóðÜèçóå îáíÜ ìå Ýíáí ðéï ðïëýðëïêï êùäéêü. Ïé êùäéêïß ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí Ýùò ðÝíôå ÷áñáêôÞñåò, íá ìçí åßíáé åýêïëïé íá ìáíôåõôïýí (ð.÷. ôï ðñáãìáôéêü ïíïìÜ óïõ Þ ôï øåõäþíõìï óïõ), êáé íá ìçí ðåñéÝ÷åé êåíü Þ äéÜöïðïõò Üëëïõò ÷áñáêôÞñåò. diff --git a/lang/hun.l b/lang/hun.l index 84224f247..e0f3b3f8b 100644 --- a/lang/hun.l +++ b/lang/hun.l @@ -186,9 +186,6 @@ ACCESS_DENIED Hozzáférés megtagadva. PERMISSION_DENIED Engedély megtagadva. -RAW_DISABLED - A RAW opcó nem használható. Ha használnod kell, állitsd - akkor be a DisableRaw beállitást a Szerviz beállításnál. MORE_OBSCURE_PASSWORD Próbálj nehezebb jelszót használni .Jelszavad min. öt karakter legyen, és nem kitalálható legyen, (ne a @@ -179,8 +179,6 @@ ACCESS_DENIED Accesso negato. PERMISSION_DENIED Permesso negato. -RAW_DISABLED - L'opzione RAW è stata disabilitata. Se devi usarla, attiva la direttiva DisableRaw nella configurazione dei Services. MORE_OBSCURE_PASSWORD Per favore, prova di nuovo con una password più oscura. Le password devono essere lunghe almeno 5 caratteri, non devono essere indovinate facilmente (ad es. il proprio nome o nick), e non possono contenere i caratteri di spazio e di tabulazione. @@ -179,9 +179,6 @@ ACCESS_DENIED Toegang geweigerd. PERMISSION_DENIED Toestemming geweigerd. -RAW_DISABLED - De RAW optie is uitgeschakeld. Als je deze moet gebruiken, stel dan de DisableRaw optie in de Services configuratie in. - MORE_OBSCURE_PASSWORD Probeer aub opnieuw met een onduidelijker wachtwoord. Wachtwoorden moeten tenminste 5 tekens lang zijn, niet iets makkelijk raadbaars (bijv. je echte naam of je nick), en kan geen tab of spatie bevatten. @@ -201,10 +201,6 @@ ACCESS_DENIED PERMISSION_DENIED Brak uprawnieñ. -RAW_DISABLED - Polecenie RAW zosta³o wy³±czone. Je¶li chcesz go u¿ywaæ, - ustaw odpowiednio DisableRaw w konfiguracji serwisów. - MORE_OBSCURE_PASSWORD Proszê spróbowaæ ponownie z trudniejszym has³em. Has³o powinno mieæ minimum 5 znaków oraz powinno @@ -187,8 +187,6 @@ ACCESS_DENIED Acesso negado. PERMISSION_DENIED Permissão negada. -RAW_DISABLED - A opção RAW está desabilitada. Se realmente precisar, deve desabilitar a opção DisableRaw na configuração dos Services. MORE_OBSCURE_PASSWORD Por favor tente novamente com uma senha mais difícil. Não use TAB ou espaços. @@ -183,8 +183,6 @@ ACCESS_DENIED Äîñòóï çàïðåùåí. PERMISSION_DENIED Íåäîñòàòî÷íî ïðàâ äëÿ äîñòóïà. -RAW_DISABLED - Êîìàíäà RAW îòêëþ÷åíà. Åñëè âû æåëàåòå èñïîëüçîâàòü åå, çàêîììåíòèðóéòå äèðåêòèâó DisableRaw â êîíôèãóðàöèîííîì ôàéëå ñåðâèñîâ. MORE_OBSCURE_PASSWORD Ïîæàëóéñòà, ïîïðîáóéòå ñíîâà ñ áîëåå ñëîæíûì ïàðîëåì. Îí äîëæåí èìåòü äëèíó íå ìåíåå 5 ñèìâîëîâ, ñîñòîÿòü òîëüêî èç ëàòèíñêèõ áóêâ èëè öèôð, íå áûòü ëåãêî îòãàäûâàåìûì (ò.å. Âàøèì èìåíåì èëè Âàøèì íèêîì), è íå äîëæåí ñîäåðæàòü ïðîáåëîâ è òàáóëÿöèé. @@ -181,8 +181,6 @@ ACCESS_DENIED Bu komuta eriþiminiz yok. PERMISSION_DENIED Bu komutu kullanma izniniz yok. -RAW_DISABLED - The RAW option has been disabled. If you must use it, enable the DisableRaw directive in Services configuration. MORE_OBSCURE_PASSWORD Lütfen daha zor bir þifre deneyin. Þifreler en az 5 karakter uzunlukta, kolayca tahmin edilemeyecek birþey olmalýdýr(ör: gerçek isminiz, nickiniz v.b. olmamalýdýr), ve boþlukla tab kullanýlmamalýdýr. diff --git a/src/config.c b/src/config.c index 6f3e1beb1..2ad7e753d 100644 --- a/src/config.c +++ b/src/config.c @@ -188,7 +188,6 @@ bool WallOSSQLine; bool WallOSSZLine; bool WallOSNoOp; bool WallOSJupe; -bool WallOSRaw; bool WallAkillExpire; bool WallSGLineExpire; bool WallSQLineExpire; @@ -805,7 +804,6 @@ int ServerConfig::Read(bool bail) {"operserv", "akillonadd", "no", new ValueContainerBool(&AkillOnAdd), DT_BOOLEAN, NoValidation}, {"operserv", "killonsgline", "no", new ValueContainerBool(&KillonSGline), DT_BOOLEAN, NoValidation}, {"operserv", "killonsqline", "no", new ValueContainerBool(&KillonSQline), DT_BOOLEAN, NoValidation}, - {"operserv", "disableraw", "no", new ValueContainerBool(&DisableRaw), DT_BOOLEAN, NoValidation}, {"operserv", "notifications", "", new ValueContainerString(&OSNotifications), DT_STRING, NoValidation}, {"operserv", "limitsessions", "no", new ValueContainerBool(&LimitSessions), DT_BOOLEAN, NoValidation}, {"operserv", "defaultsessionlimit", "0", new ValueContainerUInt(&DefSessionLimit), DT_UINTEGER, NoValidation}, @@ -1593,7 +1591,7 @@ int read_config(int reload) } WallOper = WallBadOS = WallOSGlobal = WallOSMode = WallOSClearmodes = WallOSKick = WallOSAkill = WallOSSGLine = WallOSSQLine = WallOSSZLine = WallOSNoOp = - WallOSJupe = WallOSRaw = WallAkillExpire = WallSGLineExpire = WallSQLineExpire = WallSZLineExpire = WallExceptionExpire = WallGetpass = WallSetpass = + WallOSJupe = WallAkillExpire = WallSGLineExpire = WallSQLineExpire = WallSZLineExpire = WallExceptionExpire = WallGetpass = WallSetpass = WallForbid = WallDrop = false; if (!OSNotifications.empty()) { spacesepstream notifications(OSNotifications); @@ -1611,7 +1609,6 @@ int read_config(int reload) else if (notice == "osszline") WallOSSZLine = true; else if (notice == "osnoop") WallOSNoOp = true; else if (notice == "osjupe") WallOSJupe = true; - else if (notice == "osraw") WallOSRaw = true; else if (notice == "akillexpire") WallAkillExpire = true; else if (notice == "sglineexpire") WallSGLineExpire = true; else if (notice == "sqlineexpire") WallSQLineExpire = true; |