diff --git a/NEWS b/NEWS index 827acab07..54eea1d7e 100644 --- a/NEWS +++ b/NEWS @@ -65,7 +65,7 @@ Eggdrop v1.9.4: Tcl API changes: - Moved the 'gotmsg' function back as a raw bind. It was inadvertently - moved to a rawt bind in 1.9.3, causing issuse with scripts attempting to + moved to a rawt bind in 1.9.3, causing issues with scripts attempting to unbind this internal reference Module changes: - None @@ -219,7 +219,7 @@ Eggdrop v1.9.0: - Added Twitch support - Added support for users that change hosts mid-session, usually associated with authenticating with services (396 raw code and CHGHOST capability). - - Added support for the users that change their realname value mis-session + - Added support for the users that change their realname value mid-session (SETNAME capability) - Added the ability for Eggdrop to internally track the away status of an individual, with some limitations. @@ -239,9 +239,9 @@ Eggdrop v1.9.0: otherwise the connection will be in plaintext. A port not prefixed with a + can still be upgraded with STARTTLS, allowing 1.8 bots and scripts to initiate a secure connection, but 1.9.0 bots will not attempt the upgrade. - - Added granular userfile sharing flags (bcejnu). Adding these flags can limit - userfile sharing to a combination of bans, invites, exempts, channels, - users, and ignores (or still the s flag for all these). + - Added granular userfile sharing flags (bcejnu). Adding these flags can + limit userfile sharing to a combination of bans, invites, exempts, + channels, users, and ignores (or still the s flag for all these). - No longer try port+1,2,3 when connecting to a botnet port doesn't work the first time diff --git a/doc/Changes1.8 b/doc/Changes1.8 index f472a38e0..84b8e046a 100644 --- a/doc/Changes1.8 +++ b/doc/Changes1.8 @@ -199,7 +199,7 @@ Eggdrop v1.8.4rc1 (2018-12-12): * define/use CHANNELLEN; convert some strncpy + \0 into strlcpy() * fix readme typo * Add NickServ certificate auth to docs - 2018-10-12 * Replace stuct with FLEXIBLE_ARRAY_MEMBER + 2018-10-12 * Replace struct with FLEXIBLE_ARRAY_MEMBER [Patch by: michaelortmann] * Fix information leak through TCL variables. Fixes #137. Fixes #414 [Found by: maimizuno / Patch by: michaelortmann] diff --git a/doc/sphinx_source/tutorials/firststeps.rst b/doc/sphinx_source/tutorials/firststeps.rst index 0d67d92fc..368d8605e 100644 --- a/doc/sphinx_source/tutorials/firststeps.rst +++ b/doc/sphinx_source/tutorials/firststeps.rst @@ -166,7 +166,7 @@ Simple Authentication and Security Layer (SASL) is becoming a prevalant method o openssl req -new -x509 -nodes -keyout eggdrop.key -out eggdrop.crt -You will need to determine yoru public key fingerprint by using:: +You will need to determine your public key fingerprint by using:: openssl x509 -in eggdrop.crt -outform der | sha1sum -b | cut -d' ' -f1 diff --git a/doc/sphinx_source/tutorials/userfilesharing.rst b/doc/sphinx_source/tutorials/userfilesharing.rst index ed40c46f5..3ca6ef0d2 100644 --- a/doc/sphinx_source/tutorials/userfilesharing.rst +++ b/doc/sphinx_source/tutorials/userfilesharing.rst @@ -45,6 +45,6 @@ In the example above, we add the +s bot flag to LiefErikson's bot record on Huba Lastly, the +g flag is used on both bot records to indicate that Hubalicious is authorized to send userfiles for all channels. This is a shortcut method to sharing all channels instead of setting the `+shared` channel setting on the hub for each channel userfile you wish the hub to share (set via .chanset), and using the `|+s #channel` bot flag for each channel userfile that the leaf is authorized to receive userfiles from the hub. As an example of channel-specific userfile sharing, you would use `.botattr LiefErikson |+s #theforest` on Hubalicious to set #theforest as a channel authorized to be shared to LiefErikson, and `chanset #theforest +shared` to tell LiefErikson to accept the channel userfile for #theforest. -One more commonly used flag is the `+a` flag. This flag specifies an alternate hub to connect to incase the primary hub goes down. The alternate hub should be linked to hub and maintain all channel userfiles the hub maintains to ensure there is no desynchronization while the hub bot is down. Should the hub bot go down, and assuming the `+h` flag is set for the hub on a leaf, the leafbost will automatically try to reconnect to the hub every minute, even if it makes a connection with the alternate hub in the meantime. An alternate hub is added the same as a hub, except swapping out the `h` for the `a`: `.botattr AltRock +agp`. +One more commonly used flag is the `+a` flag. This flag specifies an alternate hub to connect to in case the primary hub goes down. The alternate hub should be linked to hub and maintain all channel userfiles the hub maintains to ensure there is no desynchronization while the hub bot is down. Should the hub bot go down, and assuming the `+h` flag is set for the hub on a leaf, the leafbost will automatically try to reconnect to the hub every minute, even if it makes a connection with the alternate hub in the meantime. An alternate hub is added the same as a hub, except swapping out the `h` for the `a`: `.botattr AltRock +agp`. Now that you have a hub and leaf bot successfully connected and sharing userfiles, you can repeat the `On the Leaf Bot`_ section to add additional leafs to your hub. diff --git a/eggdrop.conf b/eggdrop.conf index 852758286..832f13c79 100755 --- a/eggdrop.conf +++ b/eggdrop.conf @@ -712,8 +712,8 @@ set use-info 1 # floods. set allow-ps 0 -# The following settings are used as default values when you .+chan #chan or .tcl -# channel add #chan. Look below for explanation of every option. +# The following settings are used as default values when you .+chan #chan or +# .tcl channel add #chan. Look below for explanation of every option. set default-flood-chan 15:60 set default-flood-deop 3:10 diff --git a/help/cmds1.help b/help/cmds1.help index 6857fcb6d..17b17b1dd 100644 --- a/help/cmds1.help +++ b/help/cmds1.help @@ -133,8 +133,8 @@ See also: tcl %bNOTE:%b This command is NOT used to replace .chattr. It modifies bot flags, such as s, h, a, u, etc. - %bNOTE:%b You can't use this command on bots which are directly linked to your - bot at the current moment. + %bNOTE:%b You can't use this command on bots which are directly linked to + your bot at the current moment. See also: whois, chattr %{help=botinfo}%{-} diff --git a/src/main.c b/src/main.c index c19a076ea..450d6bc83 100644 --- a/src/main.c +++ b/src/main.c @@ -97,7 +97,7 @@ int egg_numver = EGG_NUMVER; char notify_new[121] = ""; /* Person to send a note to for new users */ int default_flags = 0; /* Default user flags */ -int default_uflags = 0; /* Default user-definied flags */ +int default_uflags = 0; /* Default user-defined flags */ int backgrd = 1; /* Run in the background? */ int con_chan = 0; /* Foreground: constantly display channel stats? */ diff --git a/src/misc.c b/src/misc.c index 1c521475e..4eae6189f 100644 --- a/src/misc.c +++ b/src/misc.c @@ -317,7 +317,7 @@ void maskaddr(const char *s, char *nw, int type) u = strchr(s, '!'); if (u) h = strchr(u, '@'); - if (!h){ + if (!h) { h = strchr(s, '@'); u = 0; } diff --git a/src/mod/dns.mod/coredns.c b/src/mod/dns.mod/coredns.c index f1f440770..d551f0d87 100644 --- a/src/mod/dns.mod/coredns.c +++ b/src/mod/dns.mod/coredns.c @@ -443,12 +443,12 @@ static void linkresolveip(struct resolve *addrp) } #ifdef IPV6 -static void linkresolveip6(struct resolve *addrp){ +static void linkresolveip6(struct resolve *addrp) { struct resolve *rp; unsigned long bashnum; bashnum = getip6bash(&addrp->sockname.addr.s6.sin6_addr); rp = ip6bash[bashnum]; - if (rp){ + if (rp) { while ((rp->nextip) && (addrp->sockname.addr.s6.sin6_addr.s6_addr[15] > rp->nextip->sockname.addr.s6.sin6_addr.s6_addr[15])) @@ -634,7 +634,7 @@ static struct resolve *findip6(struct in6_addr *ip6) unsigned long bashnum; bashnum = getip6bash(ip6); rp = ip6bash[bashnum]; - if (rp){ + if (rp) { while ((rp->nextip) && (ip6->s6_addr[15] >= (rp->nextip->sockname.addr.s6.sin6_addr.s6_addr[15]))) rp = rp->nextip; diff --git a/src/mod/notes.mod/language/notes.german.lang b/src/mod/notes.mod/language/notes.german.lang index 1f4902384..f3c038af7 100644 --- a/src/mod/notes.mod/language/notes.german.lang +++ b/src/mod/notes.mod/language/notes.german.lang @@ -20,7 +20,7 @@ 0xc010,Alle Nachrichten geloescht 0xc011,Geloescht 0xc012,uebrig -0xc013,'#' koennen Zahlen und/oder Intervalle getrennt duch ';' sein. +0xc013,'#' koennen Zahlen und/oder Intervalle getrennt durch ';' sein. 0xc014,Dies ist ein Bot. Du kannst einem Bot keine Nachricht hinterlassen. 0xc015,Outside Nachricht 0xc016,Nachricht zugestellt. diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index c0d468907..254a4b7d5 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -158,7 +158,7 @@ char *python_start(Function *global_funcs) module_undepend(MODULE_NAME); return "This module requires irc module 1.5 or later."; } - // irc.mod depends on server.mod and channels.mod, so those were implicitely loaded + // irc.mod depends on server.mod and channels.mod, so those were implicitly loaded if ((s = init_python())) return s; diff --git a/src/mod/seen.mod/seen.c b/src/mod/seen.mod/seen.c index 63ddd0593..54c82ee73 100644 --- a/src/mod/seen.mod/seen.c +++ b/src/mod/seen.mod/seen.c @@ -242,7 +242,7 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand, dprintf(idx, "%sYour what, %s?\n", prefix, nick); return; } - /* Do I even KNOW the requestor? */ + /* Do I even KNOW the requester? */ if (hand[0] == '*' || !hand[0]) { dprintf(idx, "%sI don't know you, %s, so I don't know about your %s.\n", diff --git a/src/mod/transfer.mod/language/transfer.german.lang b/src/mod/transfer.mod/language/transfer.german.lang index ab4b863d2..ab11798de 100644 --- a/src/mod/transfer.mod/language/transfer.german.lang +++ b/src/mod/transfer.mod/language/transfer.german.lang @@ -34,7 +34,7 @@ # 0xf1e, < dieses ist jetzt leer 0xf1f,Getrennt von %s (Userfile Transfer abgebrochen) 0xf20,Verlor DCC send %s von %s!%s (%lu/%lu) -0xf21,(!) Erneutes laden von Packet von %s fuer %s ist ungueltig! +0xf21,(!) Erneutes Laden von Paket von %s fuer %s ist ungueltig! 0xf22,!! Fortsetzung von Datei-Transfer hinter dem Dateiende fuer %s zu %s 0xf23,!!! Versuche Teile des Userfile Transfers auszulassen 0xf24,Fortsetzung von Dateitransfer bei %dk fuer %s zu %s