diff --git a/language/core.danish.lang b/language/core.danish.lang index ffac6077e..56333b8aa 100644 --- a/language/core.danish.lang +++ b/language/core.danish.lang @@ -430,3 +430,5 @@ Telnet botten og skriv 'NEW' som dit nick.\n 0xe33,Mistede telnet forbindelse fra %s mens der blev tjekket for dubletter 0xe34,TIMEOUT ident forbindelse 0xe35,Please remove the #comment from your listen setting and try again +0xe36,This port is for bots only +0xe37,This port is for users only (no bots) diff --git a/language/core.english.lang b/language/core.english.lang index 1d6cd5bdb..b4e455c2a 100644 --- a/language/core.english.lang +++ b/language/core.english.lang @@ -430,3 +430,5 @@ Telnet to the bot and enter 'NEW' as your handle. 0xe33,Lost telnet connection from %s while checking for duplicate 0xe34,TIMEOUT ident connection 0xe35,Please remove the #comment from your listen setting and try again +0xe36,This port is for bots only +0xe37,This port is for users only (no bots) diff --git a/language/core.finnish.lang b/language/core.finnish.lang index f9cf8f691..83319105d 100644 --- a/language/core.finnish.lang +++ b/language/core.finnish.lang @@ -430,3 +430,5 @@ Telnettaa botille ja sy 0xe33,Telnet yhteys hukattu %s silläaikaa kun tarkistettiin tuplausta 0xe34,Kadotettu ident yhteys 0xe35,Please remove the #comment from your listen setting and try again +0xe36,This port is for bots only +0xe37,This port is for users only (no bots) diff --git a/language/core.french.lang b/language/core.french.lang index 607408beb..c25088f34 100644 --- a/language/core.french.lang +++ b/language/core.french.lang @@ -430,3 +430,5 @@ Faites un Telnet sur le bot et entrez 'NEW' comme surnom. 0xe33,Connexion telnet de %s perdue pendant la vérification des doublons 0xe34,Timeout ident connection 0xe35,Please remove the #comment from your listen setting and try again +0xe36,Ce port est réservé aux bots +0xe37,Ce port est réservé aux utilisateurs (pas de bots) diff --git a/language/core.german.lang b/language/core.german.lang index f33e80462..67af27e20 100644 --- a/language/core.german.lang +++ b/language/core.german.lang @@ -278,7 +278,7 @@ Baue eine Telnetverbindung zu dem Bot auf und gib 'NEW' als Deinen Nickname ein. 0x90b,Missbrauch eines Desync 0x90c,Flood -0xa00,keine ignorierten User +0xa00,keine ignorierten Benutzer 0xa01,Im Moment werden ignoriert 0xa02,Ignoriere nicht mehr @@ -438,3 +438,5 @@ Baue eine Telnetverbindung zu dem Bot auf und gib 'NEW' als Deinen Nickname ein. 0xe33,Telnet-Verbindung von %s waerend Kontrolle auf Duplikat verloren 0xe34,Zeitueberschreitung bei der Ident-Verbindung 0xe35,Bitte entferne den #Kommentar im listen-Befehl und versuche es erneut +0xe36,Dieser Port ist nur fuer Bots +0xe37,Dieser Port ist nur fuer Benutzer (keine Bots) diff --git a/language/core.italian.lang b/language/core.italian.lang index cad3222ba..6c3f3fb49 100644 --- a/language/core.italian.lang +++ b/language/core.italian.lang @@ -434,3 +434,5 @@ Connetti in telnet il bot e scrivi 'NEW' come tuo soprannome. 0xe33,Connessione telnet persa da %s mentre controllo se è un duplicato 0xe34,Connessione ident fuori tempo 0xe35,Per favore togli il #commento dalle tue impostazione di ascolto e riprova +0xe36,Questa porta è solo per bot +0xe37,Questa porta è solo per utenti (non bot) diff --git a/language/core.portuguese.lang b/language/core.portuguese.lang index f1347d663..e1dd8958a 100644 --- a/language/core.portuguese.lang +++ b/language/core.portuguese.lang @@ -430,3 +430,5 @@ Entre em ligação telnet com o bot e digite 'NEW' como o seu nick. 0xe33,Perdida ligação telnet de %s aquando verificação de duplicados 0xe34,Timeout em ligação de identificação 0xe35,Por favor, remova o #comentário na configuração de listen e tente novamente +0xe36,Esta porta é apenas para bots +0xe37,Esta porta é apenas para utilizadores (sem bots) diff --git a/src/dcc.c b/src/dcc.c index 88fc73c92..931c37d63 100644 --- a/src/dcc.c +++ b/src/dcc.c @@ -1601,8 +1601,16 @@ static void dcc_telnet_id(int idx, char *buf, int atr) #endif /* Make sure users-only/bots-only connects are honored */ if ((dcc[idx].status & STAT_BOTONLY) && !glob_bot(fr)) { - dprintf(idx, "This telnet port is for bots only.\n"); - putlog(LOG_BOTS, "*", DCC_NONBOT, dcc[idx].host); + if (dcc[idx].user) { + dprintf(idx, "%s\n", DCC_NONBOT2); + putlog(LOG_BOTS, "*", DCC_NONBOT, dcc[idx].host); + } + else { + if (!stealth_telnets) { + dprintf(idx, "You don't have access.\n"); + } + putlog(LOG_MISC, "*", DCC_INVHANDLE, dcc[idx].host, buf); + } killsock(dcc[idx].sock); lostdcc(idx); return; @@ -1610,7 +1618,7 @@ static void dcc_telnet_id(int idx, char *buf, int atr) if ((dcc[idx].status & STAT_USRONLY) && glob_bot(fr)) { /* change here temp to use bot output */ dcc[idx].type = &DCC_BOT_NEW; - dprintf(idx, "error Only users may connect at this port.\n"); + dprintf(idx, "%s\n", DCC_NONUSER2); dcc[idx].type = old; putlog(LOG_BOTS, "*", DCC_NONUSER, dcc[idx].host); killsock(dcc[idx].sock); @@ -1635,7 +1643,8 @@ static void dcc_telnet_id(int idx, char *buf, int atr) ok = 1; if (!ok) { - dprintf(idx, "You don't have access.\n"); + if (!stealth_telnets) + dprintf(idx, "You don't have access.\n"); putlog(LOG_MISC, "*", DCC_INVHANDLE, dcc[idx].host, buf); killsock(dcc[idx].sock); lostdcc(idx); diff --git a/src/lang.h b/src/lang.h index 2609e6651..a130819b3 100644 --- a/src/lang.h +++ b/src/lang.h @@ -490,5 +490,7 @@ #define DCC_LOSTDUP get_language(0xe33) #define DCC_TIMEOUTIDENT get_language(0xe34) #define DCC_BADLISTEN get_language(0xe35) +#define DCC_NONBOT2 get_language(0xe36) +#define DCC_NONUSER2 get_language(0xe37) #endif /* _EGG_LANG_H */