August 2012 - ngIRCd GIT Updates

Alexander Barton : New function Conn_StartLogin() to finish connection initialization
by alex＠arthur.barton.de 29 Aug '12

29 Aug '12

Module: ngircd.git Branch: master Commit: 01b62202b2caa1b8161e62f149a9d6f705713869 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=01b62202… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 29 17:24:19 2012 +0200 New function Conn_StartLogin() to finish connection initialization Conn_StartLogin() is called after the connection has been established and fully innitialized, including the SSL handshake, for example. Up to this patch, the "NoticeAuth" option broke the SSL handshake ... --- src/ngircd/conn-ssl.c | 2 ++ src/ngircd/conn.c | 72 +++++++++++++++++++++++++++++++++---------------- src/ngircd/conn.h | 4 +++ 3 files changed, 55 insertions(+), 23 deletions(-) diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 5d44b30..8f7b70a 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -625,6 +625,8 @@ ConnectAccept( CONNECTION *c, bool connect) #endif /* _GNUTLS */ Conn_OPTION_DEL(c, (CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ|CONN_SSL_CONNECT)); ConnSSL_LogCertInfo(c); + + Conn_StartLogin(CONNECTION2ID(c)); return 1; } diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 8fd162b..81a0f45 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -88,7 +88,7 @@ static bool Handle_Write PARAMS(( CONN_ID Idx )); static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len )); -static int New_Connection PARAMS(( int Sock )); +static int New_Connection PARAMS(( int Sock, bool IsSSL )); static CONN_ID Socket2Index PARAMS(( int Sock )); static void Read_Request PARAMS(( CONN_ID Idx )); static unsigned int Handle_Buffer PARAMS(( CONN_ID Idx )); @@ -134,7 +134,7 @@ static void cb_listen(int sock, short irrelevant) { (void) irrelevant; - (void) New_Connection(sock); + (void) New_Connection(sock, false); } @@ -152,7 +152,7 @@ cb_listen_ssl(int sock, short irrelevant) int fd; (void) irrelevant; - fd = New_Connection(sock); + fd = New_Connection(sock, true); if (fd < 0) return; io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl); @@ -1362,17 +1362,18 @@ Count_Connections(ng_ipaddr_t *a) * Initialize new client connection on a listening socket. * * @param Sock Listening socket descriptor. + * @param IsSSL true if this socket expects SSL-encrypted data. * @returns Accepted socket descriptor or -1 on error. */ static int -New_Connection(int Sock) +New_Connection(int Sock, bool IsSSL) { #ifdef TCPWRAP struct request_info req; #endif ng_ipaddr_t new_addr; char ip_str[NG_INET_ADDRSTRLEN]; - int new_sock, new_sock_len, identsock; + int new_sock, new_sock_len; CLIENT *c; long cnt; @@ -1492,31 +1493,56 @@ New_Connection(int Sock) Log(LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock, My_Connections[new_sock].host, ng_ipaddr_getport(&new_addr), Sock); + Account_Connection(); + +#ifdef SSL_SUPPORT + /* Delay connection initalization until SSL handshake is finished */ + if (!IsSSL) +#endif + Conn_StartLogin(new_sock); + + return new_sock; +} /* New_Connection */ + + +/** + * Finish connection initialization, start resolver subprocess. + * + * @param Idx Connection index. + */ +GLOBAL void +Conn_StartLogin(CONN_ID Idx) +{ + int ident_sock = -1; + + assert(Idx >= 0); + + /* Nothing to do if DNS (and resolver subprocess) is disabled */ + if (!Conf_DNS) + return; - identsock = new_sock; #ifdef IDENTAUTH - if (!Conf_Ident) - identsock = -1; + /* Should we make an IDENT request? */ + if (Conf_Ident) + ident_sock = My_Connections[Idx].sock; #endif - if (Conf_DNS) { - if (Conf_NoticeAuth) { + + if (Conf_NoticeAuth) { + /* Send "NOTICE AUTH" messages to the client */ #ifdef IDENTAUTH - if (Conf_Ident) - (void)Conn_WriteStr(new_sock, - "NOTICE AUTH :*** Looking up your hostname and checking ident"); - else + if (Conf_Ident) + (void)Conn_WriteStr(Idx, + "NOTICE AUTH :*** Looking up your hostname and checking ident"); + else #endif - (void)Conn_WriteStr(new_sock, - "NOTICE AUTH :*** Looking up your hostname"); - (void)Handle_Write(new_sock); - } - Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, - identsock, cb_Read_Resolver_Result); + (void)Conn_WriteStr(Idx, + "NOTICE AUTH :*** Looking up your hostname"); + (void)Handle_Write(Idx); } - Account_Connection(); - return new_sock; -} /* New_Connection */ + Resolve_Addr(&My_Connections[Idx].proc_stat, &My_Connections[Idx].addr, + ident_sock, cb_Read_Resolver_Result); +} /** diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 4a8b677..e42a2ae 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -101,6 +101,8 @@ GLOBAL CONNECTION *My_Connections; GLOBAL CONN_ID Pool_Size; GLOBAL long WCounter; +#define CONNECTION2ID(x) (long)(x - My_Connections) + #endif /* CONN_MODULE */ @@ -112,6 +114,8 @@ GLOBAL void Conn_CloseAllSockets PARAMS((int ExceptOf)); GLOBAL unsigned int Conn_InitListeners PARAMS(( void )); GLOBAL void Conn_ExitListeners PARAMS(( void )); +GLOBAL void Conn_StartLogin PARAMS((CONN_ID Idx)); + GLOBAL void Conn_Handler PARAMS(( void )); GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... ));

1 0

Alexander Barton : Convert CONN_ID and Conf_MaxConnections to "int" datatype
by alex＠arthur.barton.de 29 Aug '12

29 Aug '12

Module: ngircd.git Branch: master Commit: b68bb560e9140c0ec783ea02773aef50d11ac06d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b68bb560… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 29 17:03:41 2012 +0200 Convert CONN_ID and Conf_MaxConnections to "int" datatype We can't handle more connections than accept(2) can supply, and accept(2) returns an "int" ... --- src/ngircd/conf.c | 4 ++-- src/ngircd/conf.h | 2 +- src/ngircd/conn.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 3966dc9..034281c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -346,7 +346,7 @@ Conf_Test( void ) puts("[LIMITS]"); printf(" ConnectRetry = %d\n", Conf_ConnectRetry); - printf(" MaxConnections = %ld\n", Conf_MaxConnections); + printf(" MaxConnections = %d\n", Conf_MaxConnections); printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); @@ -1432,7 +1432,7 @@ Handle_LIMITS(int Line, char *Var, char *Arg) return; } if (strcasecmp(Var, "MaxConnections") == 0) { - Conf_MaxConnections = atol(Arg); + Conf_MaxConnections = atoi(Arg); if (!Conf_MaxConnections && strcmp(Arg, "0")) Config_Error_NaN(Line, Var); return; diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 8e66c07..7a4e38a 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -206,7 +206,7 @@ GLOBAL bool Conf_ConnectIPv6; GLOBAL bool Conf_ConnectIPv4; /** Maximum number of simultaneous connections to this server */ -GLOBAL long Conf_MaxConnections; +GLOBAL int Conf_MaxConnections; /** Maximum number of channels a user can join */ GLOBAL int Conf_MaxJoins; diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 7dcc8d9..4a8b677 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -42,7 +42,7 @@ #define CONN_SSL_WANT_READ 128 /* SSL/TLS library needs to read protocol data */ #define CONN_SSL_FLAGS_ALL (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ) #endif -typedef long CONN_ID; +typedef int CONN_ID; #include "client.h" #include "proc.h" @@ -126,6 +126,7 @@ GLOBAL void Conn_SyncServerStruct PARAMS(( void )); GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd)); GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i)); GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i)); + #ifdef SSL_SUPPORT GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len)); GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx));

1 0

Alexander Barton : Introduce numeric RPL_HOSTHIDDEN_MSG(396)
by alex＠arthur.barton.de 28 Aug '12

28 Aug '12

Module: ngircd.git Branch: master Commit: 21467c76f15a7773695ce3a37c7c843cb4682ac2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21467c76… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 28 23:28:56 2012 +0200 Introduce numeric RPL_HOSTHIDDEN_MSG(396) This numeric is sent to the client each time it changes its displayed hostname using "MODE +/-x", and if "CloakHost" is set right after the MOTD has been sent. --- src/ngircd/irc-info.c | 10 +++++++++- src/ngircd/irc-mode.c | 6 ++++++ src/ngircd/messages.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index f5139d0..6ec184a 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1483,7 +1483,15 @@ Show_MOTD_Sendline(CLIENT *Client, const char *msg) static bool Show_MOTD_End(CLIENT *Client) { - return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client )); + if (!IRC_WriteStrClient(Client, RPL_ENDOFMOTD_MSG, Client_ID(Client))) + return DISCONNECTED; + + if (*Conf_CloakHost) + return IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, + Client_ID(Client), + Client_Hostname(Client)); + + return CONNECTED; } #ifdef SSL_SUPPORT diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index dc37ad0..7155720 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -138,6 +138,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) { char the_modes[COMMAND_LEN], x[2], *mode_ptr; bool ok, set; + bool send_RPL_HOSTHIDDEN_MSG = false; int mode_arg; size_t len; @@ -279,6 +280,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) Client_ID(Origin)); else x[0] = 'x'; + send_RPL_HOSTHIDDEN_MSG = true; break; default: if (Client_Type(Client) != CLIENT_SERVER) { @@ -348,6 +350,10 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) "MODE %s :%s", Client_ID(Target), the_modes); + if (send_RPL_HOSTHIDDEN_MSG) + IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, + Client_ID(Client), + Client_HostnameCloaked(Client)); } LogDebug("%s \"%s\": Mode change, now \"%s\".", Client_TypeText(Target), Client_Mask(Target), diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 2cfd45d..4f3a397 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -96,6 +96,7 @@ #define RPL_YOUREOPER_MSG "381 %s :You are now an IRC Operator" #define RPL_YOURESERVICE_MSG "383 %s :You are service %s" #define RPL_TIME_MSG "391 %s %s :%s" +#define RPL_HOSTHIDDEN_MSG "396 %s %s :is your displayed hostname now" #define ERR_NOSUCHNICK_MSG "401 %s %s :No such nick or channel name" #define ERR_NOSUCHSERVER_MSG "402 %s %s :No such server"

1 0

Alexander Barton : Always cloak client hostname, if needed
by alex＠arthur.barton.de 28 Aug '12

28 Aug '12

Module: ngircd.git Branch: master Commit: 33fae67579eeab31d7f96f9e53f0529f584b0b1f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33fae675… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 28 23:26:43 2012 +0200 Always cloak client hostname, if needed Not only cloak the hostname in Client_MaskCloaked(), but also in Client_HostnameCloaked() -- so move the actual cloaking to this function and call it in Client_MaskCloaked() to get the (cloaked) hostname. This fixes USERHOST not displaying the correctly cloaked hostname, for example. --- src/ngircd/client.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 0d2d414..4728c7a 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -687,18 +687,35 @@ Client_Hostname(CLIENT *Client) /** * Get potentially cloaked hostname of a client. + * * If the client has not enabled cloaking, the real hostname is used. + * Please note that this function uses a global static buffer, so you can't + * nest invocations without overwriting earlier results! + * * @param Client Pointer to client structure * @return Pointer to client hostname */ GLOBAL char * Client_HostnameCloaked(CLIENT *Client) { + static char Cloak_Buffer[CLIENT_HOST_LEN]; + assert(Client != NULL); - if (Client_HasMode(Client, 'x')) - return Client_ID(Client->introducer); - else + + if (!Client_HasMode(Client, 'x')) return Client_Hostname(Client); + + /* Do simple mapping to the server ID? */ + if (!*Conf_CloakHostModeX) + return Client_ID(Client->introducer); + + strlcpy(Cloak_Buffer, Client->host, CLIENT_HOST_LEN); + strlcat(Cloak_Buffer, Conf_CloakHostSalt, CLIENT_HOST_LEN); + + snprintf(Cloak_Buffer, CLIENT_HOST_LEN, Conf_CloakHostModeX, + Hash(Cloak_Buffer)); + + return Cloak_Buffer; } /* Client_HostnameCloaked */ @@ -792,10 +809,12 @@ Client_Mask( CLIENT *Client ) /** * Return ID of a client with cloaked hostname: "client!user@server-name" + * * This client ID is used for IRC prefixes, for example. * Please note that this function uses a global static buffer, so you can't * nest invocations without overwriting earlier results! * If the client has not enabled cloaking, the real hostname is used. + * * @param Client Pointer to client structure * @return Pointer to global buffer containing the client ID */ @@ -803,7 +822,6 @@ GLOBAL char * Client_MaskCloaked(CLIENT *Client) { static char Mask_Buffer[GETID_LEN]; - char Cloak_Buffer[GETID_LEN]; assert (Client != NULL); @@ -811,16 +829,8 @@ Client_MaskCloaked(CLIENT *Client) if (!Client_HasMode(Client, 'x')) return Client_Mask(Client); - if(*Conf_CloakHostModeX) { - strlcpy(Cloak_Buffer, Client->host, GETID_LEN); - strlcat(Cloak_Buffer, Conf_CloakHostSalt, GETID_LEN); - snprintf(Cloak_Buffer, GETID_LEN, Conf_CloakHostModeX, Hash(Cloak_Buffer)); - } else { - strncpy(Cloak_Buffer, Client_ID(Client->introducer), GETID_LEN); - } - - snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", - Client->id, Client->user, Cloak_Buffer); + snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, + Client_HostnameCloaked(Client)); return Mask_Buffer; } /* Client_MaskCloaked */

1 0

Alexander Barton : NoticeAuth: make sure messages are flushed immediately
by alex＠arthur.barton.de 28 Aug '12

28 Aug '12

Module: ngircd.git Branch: master Commit: 864015fa3ff42a026b90e39f73fb9d5f6eaab826 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=864015fa… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 28 22:09:06 2012 +0200 NoticeAuth: make sure messages are flushed immediately --- src/ngircd/conn.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index fd17597..8fd162b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1508,6 +1508,7 @@ New_Connection(int Sock) #endif (void)Conn_WriteStr(new_sock, "NOTICE AUTH :*** Looking up your hostname"); + (void)Handle_Write(new_sock); } Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, identsock, cb_Read_Resolver_Result); @@ -2295,6 +2296,10 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) "NOTICE AUTH :*** No ident response"); } #endif + + if (Conf_NoticeAuth) + (void)Handle_Write(i); + Class_HandleServerBans(c); } #ifdef DEBUG

1 0

Alexander Barton : Merge branch 'umode-B'
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 1d3def0cc6271ff77b39deec07eee240e1968d52 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1d3def0c… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 23:27:30 2012 +0200 Merge branch 'umode-B' This patch series allows ngIRCd to support the user mode "B" ("Bot flasg"): it is settable and unsettable by every (non-restricted) client. According to DNS777, this is how Unreal and InspIRCd do behave, so do we :-) By Alexander Barton (1) and DNS777 (1) * umode-B: Add new user mode "B" to doc/Modes.txt Implement an Unreal-like user mode "B" ("Bot mode") ---

1 0

Alexander Barton : Add new user mode "B" to doc/Modes.txt
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: a26e37b7463d21e12be69b0bbdfdd74c8737dc36 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a26e37b7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 16:03:00 2012 +0200 Add new user mode "B" to doc/Modes.txt --- doc/Modes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index e47e270..99d731a 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -22,6 +22,7 @@ channels he is using at the moment. mode since description a 0.3.0 User is away. + B 20 User is flagged as a "bot". c 17 IRC operator wants to receive connect/disconnect NOTICEs. C 19 Only users that share a channel are allowed to send messages. i 0.0.1 User is "invisible".

1 0

DNS777 : Implement an Unreal-like user mode "B" ("Bot mode")
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: c2b39fdedef18b7cb634509bb3f1dd67bf47c214 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c2b39fde… Author: DNS777 <dns(a)rbose.org> Date: Thu Aug 23 09:25:30 2012 +0000 Implement an Unreal-like user mode "B" ("Bot mode") --- src/ngircd/defines.h | 2 +- src/ngircd/irc-info.c | 6 ++++++ src/ngircd/irc-mode.c | 8 ++++++++ src/ngircd/messages.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index cd0a166..27eecf1 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -161,7 +161,7 @@ #endif /** Supported user modes. */ -#define USERMODES "acCiorRswx" +#define USERMODES "aBcCiorRswx" /** Supported channel modes. */ #define CHANMODES "beiIklmnoOPrRstvz" diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 0ea8587..f5139d0 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1111,6 +1111,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_ID(from), Client_ID(c))) return DISCONNECTED; + /* IRC-Bot? */ + if (Client_HasMode(c, 'B') && + !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + /* Connected using SSL? */ if (Conn_UsesSSL(Client_Conn(c)) && !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from), diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index fa35cdd..9cad324 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -229,6 +229,14 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); break; + case 'B': /* Bot */ + if (Client_HasMode(Client, 'r')) + ok = IRC_WriteStrClient(Origin, + ERR_RESTRICTED_MSG, + Client_ID(Origin)); + else + x[0] = 'B'; + break; case 'c': /* Receive connect notices * (only settable by IRC operators!) */ if (!set || Client_Type(Client) == CLIENT_SERVER diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 9ad6be1..4858fea 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -72,6 +72,7 @@ #define RPL_NOTOPIC_MSG "331 %s %s :No topic is set" #define RPL_TOPIC_MSG "332 %s %s :%s" #define RPL_TOPICSETBY_MSG "333 %s %s %s %u" +#define RPL_WHOISBOT_MSG "335 %s %s :is a IRC Bot" #define RPL_INVITING_MSG "341 %s %s %s%s" #define RPL_INVITELIST_MSG "346 %s %s %s" #define RPL_ENDOFINVITELIST_MSG "347 %s %s :End of channel invite list"

1 0

Alexander Barton : Merge branch 'recognize-umode-R'
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: e01e8f1cb6812ac24821fa540fd6ce4e61ccbc12 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e01e8f1c… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 23:21:28 2012 +0200 Merge branch 'recognize-umode-R' By Alexander Barton (1) and DNS777 (1) * recognize-umode-R: Only allow IRC services to modify user mode "R" Recognize user mode "R" ---

1 0

Alexander Barton : Only allow IRC services to modify user mode "R"
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 186ab51137886166ad56f1682d7caafff61cf304 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=186ab511… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 23:20:32 2012 +0200 Only allow IRC services to modify user mode "R" --- src/ngircd/irc-mode.c | 5 ++--- src/ngircd/messages.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 1776936..ca4cdd0 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -256,9 +256,8 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_RESTRICTED_MSG, Client_ID(Origin)); break; - case 'R': /* Registered (only unsettable) */ - if (!set || Client_Type(Client) == CLIENT_SERVICE - || Client_Type(Client) == CLIENT_SERVER) + case 'R': /* Registered (not [un]settable by clients) */ + if (Client_Type(Client) == CLIENT_SERVER) x[0] = 'R'; else ok = IRC_WriteStrClient(Origin, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 4aed70f..82cc30f 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -138,7 +138,7 @@ #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" -#define ERR_NICKREGISTER_MSG "484 %s :Cannot set user mode (+R) -- Use IRC services" +#define ERR_NICKREGISTER_MSG "484 %s :Cannot modify user mode (+R) -- Use IRC services" #define ERR_NOOPERHOST_MSG "491 %s :Not configured for your host" #define ERR_NOTONSAMECHANNEL_MSG "493 %s :You must share a common channel with %s"

1 0