commit 48326e061aacd954e24f76c53ded10448cbc28eb from: Alexander Barton date: Fri Nov 02 13:30:19 2012 UTC Spelling fix: "nick name" -> "nickname" commit - 84e9dcbab080b03b2057df8b22327172895833be commit + 48326e061aacd954e24f76c53ded10448cbc28eb blob - 1e2392e8a2cebd2ca3a4f422209b246fb792611f blob + 296c23fd46cbb4d4da4ce0b5c7222ee4c207a173 --- ChangeLog +++ ChangeLog @@ -193,7 +193,7 @@ ngIRCd Release 19 (2012-02-29) and receiver are on the same channel. This prevents private flooding by completely unknown clients. - New RPL_WHOISREGNICK_MSG(307) numeric in WHOIS command replies: it - indicates if a nick name is registered (if user mode 'R' set). + indicates if a nickname is registered (if user mode 'R' set). - Limit channel invite, ban, and exception lists to 50 entries and fix duplicate check and error messages when adding already listed entries or deleting no (longer) existing ones. @@ -234,7 +234,7 @@ ngIRCd Release 19 (2012-02-29) limit reached), but report an error and continue. And don't check the channel limit and don't report with "too many channels" when trying to join a channel that the client already is a member of. - - ISON command: reply with the correct upper-/lowercase nick names. + - ISON command: reply with the correct upper-/lowercase nicknames. - New configuration option "PAMIsOptional": when set, clients not sending a password are still allowed to connect: they won't become "identified" and keep the "~" character prepended to their supplied @@ -281,7 +281,7 @@ ngIRCd Release 19 (2012-02-29) The bug has been introduced starting with ngIRCd 17 ... :-( (commit ID 6ebb31ab35e) - Added doc/Modes.txt: document modes supported by ngIRCd. - - Implement user mode "R": indicates that the nick name of this user + - Implement user mode "R": indicates that the nickname of this user is "registered". This mode isn't handled by ngIRCd itself, but must be set and unset by IRC services like Anope. - Implement channel mode "R": only registered users (having the user @@ -299,7 +299,7 @@ ngIRCd Release 19 (2012-02-29) - Handle channel user modes 'a', 'h', and 'q' from remote servers. These channel user modes aren't used for anything at the moment, but ngIRCd knows that these three modes are "channel user modes" - and not "channel modes", that is that these modes take an "nick name" + and not "channel modes", that is that these modes take an "nickname" argument. Like unknown user and channel modes, these modes are saved and forwarded to other servers, but ignored otherwise. - Correctly inform clients when other servers change their user modes. @@ -386,7 +386,7 @@ ngIRCd Release 18 (2011-07-10) - New configuration option "CloakHost": when set, this host name is used for every client instead of the real DNS host name (or IP address). - New configuration option "CloakUserToNick": when enabled, ngIRCd sets - every clients' user name to their nick name and hides the user name + every clients' user name to their nickname and hides the user name supplied by the IRC client. - doc/Protocol.txt: Update description of the CHANINFO and WEBIRC commands. - Doxygen'ify (document) much more source files; code cleanup ... @@ -718,7 +718,7 @@ ngIRCd 0.11.0 (2008-01-15) - New [Server] configuration Option "Bind" allows to specify the source IP address to use when connecting to remote server. - New configuration option "MaxNickLength" to specify the allowed maximum - length of user nick names. Note: must be unique in an IRC network! + length of user nicknames. Note: must be unique in an IRC network! - Enhanced the IRC+ protocol to support an enhanced "server handshake" and enable server to recognize numeric 005 (ISUPPORT) and 376 (ENDOFMOTD). See doc/Protocol.txt for details. blob - 95d5372354ad55fa0f9bf7a91b7aa3cce0f9575e blob + b6a5efd446af5ece5c7f6af483198fa9ef843731 --- NEWS +++ NEWS @@ -96,7 +96,7 @@ ngIRCd Release 19 (2012-02-29) and receiver are on the same channel. This prevents private flooding by completely unknown clients. - New RPL_WHOISREGNICK_MSG(307) numeric in WHOIS command replies: it - indicates if a nick name is registered (if user mode 'R' set). + indicates if a nickname is registered (if user mode 'R' set). - Limit channel invite, ban, and exception lists to 50 entries and fix duplicate check and error messages when adding already listed entries or deleting no (longer) existing ones. @@ -132,7 +132,7 @@ ngIRCd Release 19 (2012-02-29) NICK, and USER commands have been processed) and before the child processes for authentication are forked, so resource usage is smaller. - Added doc/Modes.txt: document modes supported by ngIRCd. - - Implement user mode "R": indicates that the nick name of this user + - Implement user mode "R": indicates that the nickname of this user is "registered". This mode isn't handled by ngIRCd itself, but must be set and unset by IRC services like Anope. - Implement channel mode "R": only registered users (having the user @@ -143,7 +143,7 @@ ngIRCd Release 19 (2012-02-29) - Handle channel user modes 'a', 'h', and 'q' from remote servers. These channel user modes aren't used for anything at the moment, but ngIRCd knows that these three modes are "channel user modes" - and not "channel modes", that is that these modes take an "nick name" + and not "channel modes", that is that these modes take an "nickname" argument. Like unknown user and channel modes, these modes are saved and forwarded to other servers, but ignored otherwise. @@ -202,7 +202,7 @@ ngIRCd Release 18 (2011-07-10) - New configuration option "CloakHost": when set, this host name is used for every client instead of the real DNS host name (or IP address). - New configuration option "CloakUserToNick": when enabled, ngIRCd sets - every clients' user name to their nick name and hides the user name + every clients' user name to their nickname and hides the user name supplied by the IRC client. - Make write buffers bigger, but flush early. Before this change, a client got disconnected if the buffer flushing at 4k failed, now regular clients @@ -370,7 +370,7 @@ ngIRCd 0.11.0 (2008-01-15) - New [Server] configuration Option "Bind" allows to specify the source IP address to use when connecting to remote server. - New configuration option "MaxNickLength" to specify the allowed maximum - length of user nick names. Note: must be unique in an IRC network! + length of user nicknames. Note: must be unique in an IRC network! - Numeric 317: implemented "signon time" (displayed in WHOIS result). - Added new server configuration option "Passive" for "Server" blocks to disable automatic outgoing connections (similar to -p option to ngircd, blob - 3d2cda6cb23f8bdd33dee20bc643dbfd59dec19c blob + c7fd7826b85539d6e6615362b9693897a2e7fa27 --- doc/Protocol.txt +++ doc/Protocol.txt @@ -133,7 +133,7 @@ protocol which allows at max 15 arguments per command) Please see for details. The information exchanged using ISUPPORT can be used to detect configuration -incompatibilities (different maximum nick name length, for example) and +incompatibilities (different maximum nickname length, for example) and therefore to disconnect the peer prior to registering it in the network. blob - 77948af09cb01b84330ed258e9488b8eab8f8c5c blob + 997a983d2bc08fbeb9bc9b2250bd487c631e779d --- doc/sample-ngircd.conf.tmpl +++ doc/sample-ngircd.conf.tmpl @@ -95,9 +95,9 @@ # Maximum number of channels a user can be member of (0: no limit): ;MaxJoins = 10 - # Maximum length of an user nick name (Default: 9, as in RFC 2812). + # Maximum length of an user nickname (Default: 9, as in RFC 2812). # Please note that all servers in an IRC network MUST use the same - # maximum nick name length! + # maximum nickname length! ;MaxNickLength = 9 # Maximum number of channels returned in response to a /list @@ -141,7 +141,7 @@ # hash is generated after each server start. ;CloakHostSalt = abcdefghijklmnopqrstuvwxyz - # Set every clients' user name to their nick name + # Set every clients' user name to their nickname ;CloakUserToNick = yes # Try to connect to other IRC servers using IPv4 and IPv6, if possible. @@ -241,7 +241,7 @@ # [Operator] sections are used to define IRC Operators. There may be # more than one [Operator] block, one for each local operator. - # ID of the operator (may be different of the nick name) + # ID of the operator (may be different of the nickname) ;Name = TheOper # Password of the IRC operator @@ -304,7 +304,7 @@ # Connect to the remote server using TLS/SSL (Default: false) ;SSLConnect = yes - # Define a (case insensitive) list of masks matching nick names that + # Define a (case insensitive) list of masks matching nicknames that # should be treated as IRC services when introduced via this remote # server, separated by commas (","). # REGULAR SERVERS DON'T NEED this parameter, so leave it empty blob - 03fac57df410d73a7d67dedb38537285785e913e blob + e3f62c84ceb3432a64410cf65e5f6df83961115e --- man/ngircd.conf.5.tmpl +++ man/ngircd.conf.5.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd.conf(5) manual page template .\" -.TH ngircd.conf 5 "Oct 2012" ngIRCd "ngIRCd Manual" +.TH ngircd.conf 5 "Nov 2012" ngIRCd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS @@ -178,8 +178,8 @@ Maximum number of channels a user can be member of (0: Default: 10. .TP \fBMaxNickLength\fR (number) -Maximum length of an user nick name (Default: 9, as in RFC 2812). Please -note that all servers in an IRC network MUST use the same maximum nick name +Maximum length of an user nickname (Default: 9, as in RFC 2812). Please +note that all servers in an IRC network MUST use the same maximum nickname length! .TP \fBMaxListSize\fR (number) @@ -227,7 +227,7 @@ The Salt for cloaked hostname hashing. When undefined generated after each server start. .TP \fBCloakUserToNick\fR (boolean) -Set every clients' user name to their nick name and hide the one supplied +Set every clients' user name to their nickname and hide the one supplied by the IRC client. Default: no. .TP \fBConnectIPv4\fR (boolean) @@ -369,7 +369,7 @@ sections are used to define IRC Operators. There may b block, one for each local operator. .TP \fBName\fR (string) -ID of the operator (may be different of the nick name). +ID of the operator (may be different of the nickname). .TP \fBPassword\fR (string) Password of the IRC operator. @@ -429,7 +429,7 @@ You can use the IRC Operator command CONNECT later on Connect to the remote server using TLS/SSL. Default: false. .TP \fBServiceMask\fR (string) -Define a (case insensitive) list of masks matching nick names that should be +Define a (case insensitive) list of masks matching nicknames that should be treated as IRC services when introduced via this remote server, separated by commas (","). REGULAR SERVERS DON'T NEED this parameter, so leave it empty (which is the default). blob - 4728c7a4672ac802d944dc599d23031f75e50d60 blob + 92262b5d8b00c0ae3248c3010032ee8ff13ac0e1 --- src/ngircd/client.c +++ src/ngircd/client.c @@ -875,7 +875,7 @@ Client_Away( CLIENT *Client ) * the appropriate error messages. * * @param Client Client that wants to change the nickname. - * @param Nick New nick name. + * @param Nick New nickname. * @returns true if nickname is valid, false otherwise. */ GLOBAL bool @@ -897,7 +897,7 @@ Client_CheckNick(CLIENT *Client, char *Nick) if (Client_Type(Client) != CLIENT_SERVER && Client_Type(Client) != CLIENT_SERVICE) { - /* Make sure that this isn't a restricted/forbidden nick name */ + /* Make sure that this isn't a restricted/forbidden nickname */ if (Conf_NickIsBlocked(Nick)) { IRC_WriteStrClient(Client, ERR_FORBIDDENNICKNAME_MSG, Client_ID(Client), Nick); blob - 16b2a61ab8564808ad6c58066898602e30431cab blob + 7a383af8696b7b685dc408b63cce5c02d99f7f6f --- src/ngircd/client.h +++ src/ngircd/client.h @@ -71,7 +71,7 @@ typedef POINTER CLIENT; typedef struct _WHOWAS { time_t time; /* time stamp of entry or 0 if unused */ - char id[CLIENT_NICK_LEN]; /* client nick name */ + char id[CLIENT_NICK_LEN]; /* client nickname */ char host[CLIENT_HOST_LEN]; /* hostname of the client */ char user[CLIENT_USER_LEN]; /* user name ("login") */ char info[CLIENT_INFO_LEN]; /* long user name */ blob - 815251297eea9da27f2db6d3cf0e7fa91433bb26 blob + da7ff844b50c14d1a17a21c9687aae9534d4a185 --- src/ngircd/conf.c +++ src/ngircd/conf.c @@ -644,11 +644,11 @@ Conf_AddServer(const char *Name, UINT16 Port, const ch } /** - * Check if the given nick name is reserved for services on a particular server. + * Check if the given nickname is reserved for services on a particular server. * * @param ConfServer The server index to check. - * @param Nick The nick name to check. - * @returns true if the given nick name belongs to an "IRC service". + * @param Nick The nickname to check. + * @returns true if the given nickname belongs to an "IRC service". */ GLOBAL bool Conf_NickIsService(int ConfServer, const char *Nick) @@ -661,11 +661,11 @@ Conf_NickIsService(int ConfServer, const char *Nick) } /** - * Check if the given nick name is blocked for "normal client" use. + * Check if the given nickname is blocked for "normal client" use. * * @param ConfServer The server index or NONE to check all configured servers. - * @param Nick The nick name to check. - * @returns true if the given nick name belongs to an "IRC service". + * @param Nick The nickname to check. + * @returns true if the given nickname belongs to an "IRC service". */ GLOBAL bool Conf_NickIsBlocked(const char *Nick) @@ -1074,7 +1074,7 @@ Check_ArgIsTrue(const char *Arg) * * @param Line Line number in configuration file. * @raram Arg Input string. - * @returns New configured maximum nick name length. + * @returns New configured maximum nickname length. */ static unsigned int Handle_MaxNickLength(int Line, const char *Arg) blob - 7860f019a8928d2959ed0e31e82fc3e18c34149d blob + f85a25fa08920a2945c02603d2c8d05cc0dde086 --- src/ngircd/conf.h +++ src/ngircd/conf.h @@ -62,7 +62,7 @@ typedef struct _Conf_Server #ifdef SSL_SUPPORT bool SSLConnect; /**< Establish connection using SSL? */ #endif - char svs_mask[CLIENT_ID_LEN]; /**< Mask of nick names that should be + char svs_mask[CLIENT_ID_LEN]; /**< Mask of nicknames that should be treated and counted as services */ } CONF_SERVER; @@ -175,7 +175,7 @@ GLOBAL char Conf_CloakHostModeX[CLIENT_ID_LEN]; /** Salt for hostname hash for cloaked hostnames */ GLOBAL char Conf_CloakHostSalt[CLIENT_ID_LEN]; -/** Use nick name as user name? */ +/** Use nickname as user name? */ GLOBAL bool Conf_CloakUserToNick; /** Enable all DNS functions? */ @@ -217,7 +217,7 @@ GLOBAL int Conf_MaxJoins; /** Maximum number of connections per IP address */ GLOBAL int Conf_MaxConnectionsIP; -/** Maximum length of a nick name */ +/** Maximum length of a nickname */ GLOBAL unsigned int Conf_MaxNickLength; /** Maximum number of channels returned to /list */ blob - 345f1bed298a9a9bd3e9d7ad417da467d6aeb534 blob + 49abf579a203586221045dfcae1f26ea93c18547 --- src/ngircd/defines.h +++ src/ngircd/defines.h @@ -92,7 +92,7 @@ /** Default nick length (including NULL), see. RFC 2812 section 1.2.1. */ #define CLIENT_NICK_LEN_DEFAULT 10 -/** Maximum nick name length (including NULL). */ +/** Maximum nickname length (including NULL). */ #define CLIENT_NICK_LEN 32 /** Max. password length (including NULL). */ blob - 31a57c6fe5b1f46fb97c292449f3d50bbd6eb0e1 blob + 54f83170e3bceea94828acb1baf83de868a43261 --- src/ngircd/irc-info.c +++ src/ngircd/irc-info.c @@ -1150,7 +1150,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE Client_ID(c))) return DISCONNECTED; - /* Registered nick name? */ + /* Registered nickname? */ if (Client_HasMode(c, 'R') && !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG, Client_ID(from), Client_ID(c))) @@ -1228,7 +1228,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) /* Get target server for this command */ if (Req->argc > 1) { /* Search the target server, which can be specified as a - * nick name on that server as well: */ + * nickname on that server as well: */ target = Client_Search(Req->argv[0]); if (!target) return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, blob - 99cd26f45818a1fa3a42bb36c67f58a4c7ac86b2 blob + 7d6e07d04c58402a4a420e897823bb32363e5623 --- src/ngircd/irc-login.c +++ src/ngircd/irc-login.c @@ -546,10 +546,10 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) hops = atoi(Req->argv[4]); info = Req->argv[5]; - /* Validate service name ("nick name") */ + /* Validate service name ("nickname") */ c = Client_Search(nick); if(c) { - /* Nick name collission: disconnect (KILL) both clients! */ + /* Nickname collission: disconnect (KILL) both clients! */ Log(LOG_ERR, "Server %s introduces already registered service \"%s\"!", Client_ID(Client), nick); Kill_Nick(nick, "Nick collision"); @@ -900,9 +900,9 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) /** - * Kill all users with a specific nick name in the network. + * Kill all users with a specific nickname in the network. * - * @param Nick Nick name. + * @param Nick Nickname. * @param Reason Reason for the KILL. */ static void blob - 5c6c52c4c9b2c9f15a4bdddcd05bef422125b929 blob + 6faf311a74f767207c0f2c622cde44e72a924280 --- src/ngircd/lists.c +++ src/ngircd/lists.c @@ -283,7 +283,7 @@ Lists_MakeMask(const char *Pattern) excl = NULL; if (!at && !excl) { - /* Neither "!" nor "@" found: use string as nick name */ + /* Neither "!" nor "@" found: use string as nickname */ strlcpy(TheMask, Pattern, sizeof(TheMask) - 5); strlcat(TheMask, "!*@*", sizeof(TheMask)); return TheMask; blob - 4bce60fb12a947908f14118b7aa200439f4284df blob + 3fc8c461bf73f1455731bf21f818a63455cd619d --- src/ngircd/numeric.c +++ src/ngircd/numeric.c @@ -63,7 +63,7 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) assert(cl != NULL); if (njoin) { - /* RFC 2813: send NJOIN with nick names and modes + /* RFC 2813: send NJOIN with nicknames and modes * (if user is channel operator or has voice) */ if (str[strlen(str) - 1] != ':') strlcat(str, ",", sizeof(str)); @@ -420,12 +420,12 @@ IRC_Num_ISUPPORT(CLIENT * Client, REQUEST * Req) if ((unsigned int)atol(value) == Conf_MaxNickLength - 1) continue; - /* Nick name length settings are different! */ + /* Nickname length settings are different! */ Log(LOG_ERR, - "Peer uses incompatible nick name length (%d/%d)! Disconnecting ...", + "Peer uses incompatible nickname length (%d/%d)! Disconnecting ...", Conf_MaxNickLength - 1, atoi(value)); Conn_Close(Client_Conn(Client), - "Incompatible nick name length", + "Incompatible nickname length", NULL, false); return DISCONNECTED; } blob - a219105f4b5aff571e045f22d58f0f5fc4d17162 blob + 8f0a5a1b8cd3c8b1fd4a193af8a7c38119d21315 --- src/ngircd/sighandlers.c +++ src/ngircd/sighandlers.c @@ -102,7 +102,7 @@ Rehash(void) Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" ); - /* Remember old server name and nick name length */ + /* Remember old server name and nickname length */ strlcpy( old_name, Conf_ServerName, sizeof old_name ); old_nicklen = Conf_MaxNickLength; @@ -113,7 +113,7 @@ Rehash(void) /* Close down all listening sockets */ Conn_ExitListeners( ); - /* Recover old server name and nick name length: these values can't + /* Recover old server name and nickname length: these values can't * be changed during run-time */ if (strcmp(old_name, Conf_ServerName) != 0 ) { strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);