ngIRCd GIT Updates August 2012

ngircd-commits@lists.barton.de

1 Teilnehmer
45 Diskussionen

DNS777 : Add some more information to channel error numerics
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 9a82304ae96ae74ae28b8c584bd4811078806577 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9a82304a… Author: DNS777 <dns(a)rbose.org> Date: Thu Aug 23 09:25:30 2012 +0000 Add some more information to channel error numerics --- src/ngircd/messages.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 9ad6be1..df6f6bc 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -99,7 +99,7 @@ #define ERR_NOSUCHNICK_MSG "401 %s %s :No such nick or channel name" #define ERR_NOSUCHSERVER_MSG "402 %s %s :No such server" #define ERR_NOSUCHCHANNEL_MSG "403 %s %s :No such channel" -#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel" +#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel (+m) -- Moderated" #define ERR_TOOMANYCHANNELS_MSG "405 %s %s :You have joined too many channels" #define ERR_WASNOSUCHNICK_MSG "406 %s %s :There was no such nickname" #define ERR_NOORIGIN_MSG "409 %s :No origin specified" @@ -124,14 +124,15 @@ #define ERR_NEEDMOREPARAMS_MSG "461 %s %s :Syntax error" #define ERR_ALREADYREGISTRED_MSG "462 %s :Connection already registered" #define ERR_PASSWDMISMATCH_MSG "464 %s :Invalid password" -#define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l)" -#define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z)" -#define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O)" -#define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R)" +#define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l) -- Channel is too full, try later" +#define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z) -- SSL connections only" +#define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O) -- IRC opers only" +#define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R) -- Registered users only" #define ERR_UNKNOWNMODE_MSG "472 %s %c :is unknown mode char for %s" -#define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i)" -#define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)" -#define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k)" +#define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i) -- Invited users only" +#define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b) -- You are banned" +#define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k) -- Wrong channel key" +#define ERR_CANNOTSENDTOCHAN2_MSG "477 %s %s :Cannot send to channel (+M) -- Registered/Identified nicks only" #define ERR_NOCHANMODES_MSG "477 %s %s :Channel doesn't support modes" #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied"

1 0

Alexander Barton : Merge branch 'move-connection-password' of git://arthur. barton.de/ngircd-alex
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: bcefdef1eaed14d3156b7fb5b9ad6d3b7078efcf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bcefdef1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 19:14:29 2012 +0200 Merge branch 'move-connection-password' of git://arthur.barton.de/ngircd-alex This patch series converts the statically allocated password buffer in the CLIENT structure into a dynamically (and only when needed) allocated buffer which is referenced by the CONNECTION structure. This a) saves memory for clients not using passwords at all and b) allows for "arbitrarily" long passwords. By Brett Smith (5) and Alexander Barton (2). * 'move-connection-password' of git://arthur.barton.de/ngircd-alex: Login_User(): use "conn" insted of calling Client_Conn(Client) Free already saved password when storing a new one Indentation and style fixes. Connection password is not constant. Implementation clean-ups. Dynamically allocate memory for connection password. Move client password from the Client to the Connection struct. ---

1 0

Alexander Barton : Login_User(): use "conn" insted of calling Client_Conn( Client)
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: f79d41e92741fa2f6bc6fef957d278707ad4236a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f79d41e9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 19:11:44 2012 +0200 Login_User(): use "conn" insted of calling Client_Conn(Client) --- src/ngircd/login.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/login.c b/src/ngircd/login.c index e1959d6..460fcd1 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -93,14 +93,14 @@ Login_User(CLIENT * Client) * the beahiour of the daemon compiled without PAM support: * because there can't be any "server password", all * passwords supplied are classified as "wrong". */ - if(Conn_Password(Client_Conn(Client))[0] == '\0') + if(Conn_Password(conn)[0] == '\0') return Login_User_PostAuth(Client); Client_Reject(Client, "Non-empty password", false); return DISCONNECTED; } if (Conf_PAMIsOptional && - strcmp(Conn_Password(Client_Conn(Client)), "") == 0) { + strcmp(Conn_Password(conn), "") == 0) { /* Clients are not required to send a password and to be PAM- * authenticated at all. If not, they won't become "identified" * and keep the "~" in their supplied user name. @@ -130,7 +130,7 @@ Login_User(CLIENT * Client) } #else /* Check global server password ... */ - if (strcmp(Conn_Password(Client_Conn(Client)), Conf_ServerPwd) != 0) { + if (strcmp(Conn_Password(conn), Conf_ServerPwd) != 0) { /* Bad password! */ Client_Reject(Client, "Bad server password", false); return DISCONNECTED;

1 0

Alexander Barton : Free already saved password when storing a new one
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 1680ea02da10dff49748214f6e01538808c7ee65 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1680ea02… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 19:05:08 2012 +0200 Free already saved password when storing a new one This shouldn't happen (clients aren't allowed to send more than one PASS command), but who knows ... --- src/ngircd/conn.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 46a3ecc..e7bf1db 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -932,6 +932,10 @@ GLOBAL void Conn_SetPassword( CONN_ID Idx, const char *Pwd ) { assert( Idx > NONE ); + + if (My_Connections[Idx].pwd) + free(My_Connections[Idx].pwd); + My_Connections[Idx].pwd = strdup(Pwd); if (My_Connections[Idx].pwd == NULL) { Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");

1 0

Brett Smith : Indentation and style fixes.
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: be97fa8ab1c47a17f6d4c17c69de89d084dc1402 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be97fa8a… Author: Brett Smith <brett(a)w3.org> Date: Thu Aug 23 14:18:15 2012 -0400 Indentation and style fixes. --- src/ngircd/conn.c | 24 ++++++++++++------------ src/ngircd/irc-server.c | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 6ab3c2a..46a3ecc 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -921,22 +921,22 @@ va_dcl GLOBAL char* Conn_Password( CONN_ID Idx ) { - assert( Idx > NONE ); - if (My_Connections[Idx].pwd == NULL) - return (char*)"\0"; - else - return My_Connections[Idx].pwd; + assert( Idx > NONE ); + if (My_Connections[Idx].pwd == NULL) + return (char*)"\0"; + else + return My_Connections[Idx].pwd; } /* Conn_Password */ GLOBAL void Conn_SetPassword( CONN_ID Idx, const char *Pwd ) { - assert( Idx > NONE ); - My_Connections[Idx].pwd = strdup(Pwd); - if (My_Connections[Idx].pwd == NULL) { - Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]"); - exit(1); - } + assert( Idx > NONE ); + My_Connections[Idx].pwd = strdup(Pwd); + if (My_Connections[Idx].pwd == NULL) { + Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]"); + exit(1); + } } /* Conn_SetPassword */ /** @@ -1167,7 +1167,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie array_free(&My_Connections[Idx].rbuf); array_free(&My_Connections[Idx].wbuf); if (My_Connections[Idx].pwd != NULL) - free(My_Connections[Idx].pwd); + free(My_Connections[Idx].pwd); /* Clean up connection structure (=free it) */ Init_Conn_Struct( Idx ); diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 5d5ee63..8526a57 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -80,7 +80,8 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true); return DISCONNECTED; } - if( strcmp( Conn_Password( Client_Conn( Client ) ), Conf_Server[i].pwd_in ) != 0 ) + if( strcmp( Conn_Password( Client_Conn( Client ) ), + Conf_Server[i].pwd_in ) != 0 ) { /* wrong password */ Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );

1 0

Brett Smith : Connection password is not constant.
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 164954a78856893c9be03d95dac73e781e4f78f5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=164954a7… Author: Brett Smith <brett(a)w3.org> Date: Thu Aug 23 13:59:17 2012 -0400 Connection password is not constant. Saying otherwise makes a warning when we assign this to conv.appdata_ptr in pam.c. --- src/ngircd/conn.c | 2 +- src/ngircd/conn.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 20d0cd4..6ab3c2a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -918,7 +918,7 @@ va_dcl return ok; } /* Conn_WriteStr */ -GLOBAL const char* +GLOBAL char* Conn_Password( CONN_ID Idx ) { assert( Idx > NONE ); diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 341489a..7dcc8d9 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -116,7 +116,7 @@ GLOBAL void Conn_Handler PARAMS(( void )); GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... )); -GLOBAL const char* Conn_Password PARAMS(( CONN_ID Idx )); +GLOBAL char* Conn_Password PARAMS(( CONN_ID Idx )); GLOBAL void Conn_SetPassword PARAMS(( CONN_ID Idx, const char *Pwd )); GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ));

1 0

Brett Smith : Implementation clean-ups.
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: c1d7f6216fc26772160f50269d87a74171f8c0a2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c1d7f621… Author: Brett Smith <brett(a)w3.org> Date: Thu Aug 23 12:24:34 2012 -0400 Implementation clean-ups. * Have Conn_Password return an empty string when no password has been set, to play better with pam.c. * Use strdup in Conn_SetPassword. --- src/ngircd/conn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 03c423e..20d0cd4 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -922,19 +922,21 @@ GLOBAL const char* Conn_Password( CONN_ID Idx ) { assert( Idx > NONE ); - return My_Connections[Idx].pwd; + if (My_Connections[Idx].pwd == NULL) + return (char*)"\0"; + else + return My_Connections[Idx].pwd; } /* Conn_Password */ GLOBAL void Conn_SetPassword( CONN_ID Idx, const char *Pwd ) { assert( Idx > NONE ); - My_Connections[Idx].pwd = calloc(strlen(Pwd) + 1, sizeof(char)); + My_Connections[Idx].pwd = strdup(Pwd); if (My_Connections[Idx].pwd == NULL) { Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]"); exit(1); } - strcpy( My_Connections[Idx].pwd, Pwd ); } /* Conn_SetPassword */ /**

1 0

Brett Smith : Dynamically allocate memory for connection password.
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 7df4c12da96b2bbc23556c0c334e1d06dd9e4887 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7df4c12d… Author: Brett Smith <brett(a)w3.org> Date: Thu Aug 23 12:12:15 2012 -0400 Dynamically allocate memory for connection password. --- src/ngircd/conn.c | 10 ++++++++-- src/ngircd/conn.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4900d7b..03c423e 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -929,8 +929,12 @@ GLOBAL void Conn_SetPassword( CONN_ID Idx, const char *Pwd ) { assert( Idx > NONE ); - strlcpy( My_Connections[Idx].pwd, Pwd, - sizeof(My_Connections[Idx].pwd) ); + My_Connections[Idx].pwd = calloc(strlen(Pwd) + 1, sizeof(char)); + if (My_Connections[Idx].pwd == NULL) { + Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]"); + exit(1); + } + strcpy( My_Connections[Idx].pwd, Pwd ); } /* Conn_SetPassword */ /** @@ -1160,6 +1164,8 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie array_free(&My_Connections[Idx].rbuf); array_free(&My_Connections[Idx].wbuf); + if (My_Connections[Idx].pwd != NULL) + free(My_Connections[Idx].pwd); /* Clean up connection structure (=free it) */ Init_Conn_Struct( Idx ); diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 9ee979f..341489a 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -72,7 +72,7 @@ typedef struct _Connection ng_ipaddr_t addr; /* Client address */ PROC_STAT proc_stat; /* Status of resolver process */ char host[HOST_LEN]; /* Hostname */ - char pwd[CLIENT_PASS_LEN]; /* password received of the client */ + char *pwd; /* password received of the client */ array rbuf; /* Read buffer */ array wbuf; /* Write buffer */ time_t signon; /* Signon ("connect") time */

1 0

Brett Smith : Move client password from the Client to the Connection struct .
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 0d5de60584f094ef3b7c27806d6cd7f79e861d7b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0d5de605… Author: Brett Smith <brett(a)w3.org> Date: Thu Aug 23 11:07:08 2012 -0400 Move client password from the Client to the Connection struct. This is a relatively naive implementation, basically doing the bare minimum necessary to make the switchover go. Subsequent commits can focus on improving the implementation. --- src/ngircd/client.c | 20 -------------------- src/ngircd/client.h | 3 --- src/ngircd/conn.c | 14 ++++++++++++++ src/ngircd/conn.h | 4 ++++ src/ngircd/irc-login.c | 2 +- src/ngircd/irc-server.c | 2 +- src/ngircd/login.c | 7 ++++--- src/ngircd/pam.c | 4 ++-- 8 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 49e2739..5ca99c0 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -441,18 +441,6 @@ Client_SetFlags( CLIENT *Client, const char *Flags ) GLOBAL void -Client_SetPassword( CLIENT *Client, const char *Pwd ) -{ - /* set password sent by client */ - - assert( Client != NULL ); - assert( Pwd != NULL ); - - strlcpy(Client->pwd, Pwd, sizeof(Client->pwd)); -} /* Client_SetPassword */ - - -GLOBAL void Client_SetAway( CLIENT *Client, const char *Txt ) { /* Set AWAY reason of client */ @@ -715,14 +703,6 @@ Client_HostnameCloaked(CLIENT *Client) GLOBAL char * -Client_Password( CLIENT *Client ) -{ - assert( Client != NULL ); - return Client->pwd; -} /* Client_Password */ - - -GLOBAL char * Client_Modes( CLIENT *Client ) { assert( Client != NULL ); diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 4dbcc7a..16b2a61 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -47,7 +47,6 @@ typedef struct _CLIENT CONN_ID conn_id; /* ID of the connection (if local) or NONE (remote) */ struct _CLIENT *introducer; /* ID of the servers which the client is connected to */ struct _CLIENT *topserver; /* toplevel servers (only valid if client is a server) */ - char pwd[CLIENT_PASS_LEN]; /* password received of the client */ char host[CLIENT_HOST_LEN]; /* hostname of the client */ char user[CLIENT_USER_LEN]; /* user name ("login") */ #if defined(PAM) && defined(IDENTAUTH) @@ -109,7 +108,6 @@ GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); #endif GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); GLOBAL char *Client_HostnameCloaked PARAMS(( CLIENT *Client )); -GLOBAL char *Client_Password PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client )); @@ -129,7 +127,6 @@ GLOBAL void Client_SetID PARAMS(( CLIENT *Client, const char *Nick )); GLOBAL void Client_SetUser PARAMS(( CLIENT *Client, const char *User, bool Idented )); GLOBAL void Client_SetOrigUser PARAMS(( CLIENT *Client, const char *User )); GLOBAL void Client_SetInfo PARAMS(( CLIENT *Client, const char *Info )); -GLOBAL void Client_SetPassword PARAMS(( CLIENT *Client, const char *Pwd )); GLOBAL void Client_SetType PARAMS(( CLIENT *Client, int Type )); GLOBAL void Client_SetHops PARAMS(( CLIENT *Client, int Hops )); GLOBAL void Client_SetToken PARAMS(( CLIENT *Client, int Token )); diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 06236fd..4900d7b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -918,6 +918,20 @@ va_dcl return ok; } /* Conn_WriteStr */ +GLOBAL const char* +Conn_Password( CONN_ID Idx ) +{ + assert( Idx > NONE ); + return My_Connections[Idx].pwd; +} /* Conn_Password */ + +GLOBAL void +Conn_SetPassword( CONN_ID Idx, const char *Pwd ) +{ + assert( Idx > NONE ); + strlcpy( My_Connections[Idx].pwd, Pwd, + sizeof(My_Connections[Idx].pwd) ); +} /* Conn_SetPassword */ /** * Append Data to the outbound write buffer of a connection. diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 4752ec1..9ee979f 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -72,6 +72,7 @@ typedef struct _Connection ng_ipaddr_t addr; /* Client address */ PROC_STAT proc_stat; /* Status of resolver process */ char host[HOST_LEN]; /* Hostname */ + char pwd[CLIENT_PASS_LEN]; /* password received of the client */ array rbuf; /* Read buffer */ array wbuf; /* Write buffer */ time_t signon; /* Signon ("connect") time */ @@ -115,6 +116,9 @@ GLOBAL void Conn_Handler PARAMS(( void )); GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... )); +GLOBAL const char* Conn_Password PARAMS(( CONN_ID Idx )); +GLOBAL void Conn_SetPassword PARAMS(( CONN_ID Idx, const char *Pwd )); + GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient )); GLOBAL void Conn_SyncServerStruct PARAMS(( void )); diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 3fb1b90..9e1abdd 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -87,7 +87,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) Client_ID(Client)); } - Client_SetPassword(Client, Req->argv[0]); + Conn_SetPassword(Client_Conn(Client), Req->argv[0]); /* Protocol version */ if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) { diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index cca295a..5d5ee63 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -80,7 +80,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true); return DISCONNECTED; } - if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 ) + if( strcmp( Conn_Password( Client_Conn( Client ) ), Conf_Server[i].pwd_in ) != 0 ) { /* wrong password */ Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] ); diff --git a/src/ngircd/login.c b/src/ngircd/login.c index 7f0299c..e1959d6 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -93,13 +93,14 @@ Login_User(CLIENT * Client) * the beahiour of the daemon compiled without PAM support: * because there can't be any "server password", all * passwords supplied are classified as "wrong". */ - if(Client_Password(Client)[0] == '\0') + if(Conn_Password(Client_Conn(Client))[0] == '\0') return Login_User_PostAuth(Client); Client_Reject(Client, "Non-empty password", false); return DISCONNECTED; } - if (Conf_PAMIsOptional && strcmp(Client_Password(Client), "") == 0) { + if (Conf_PAMIsOptional && + strcmp(Conn_Password(Client_Conn(Client)), "") == 0) { /* Clients are not required to send a password and to be PAM- * authenticated at all. If not, they won't become "identified" * and keep the "~" in their supplied user name. @@ -129,7 +130,7 @@ Login_User(CLIENT * Client) } #else /* Check global server password ... */ - if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { + if (strcmp(Conn_Password(Client_Conn(Client)), Conf_ServerPwd) != 0) { /* Bad password! */ Client_Reject(Client, "Bad server password", false); return DISCONNECTED; diff --git a/src/ngircd/pam.c b/src/ngircd/pam.c index 6382c59..88872c4 100644 --- a/src/ngircd/pam.c +++ b/src/ngircd/pam.c @@ -102,8 +102,8 @@ PAM_Authenticate(CLIENT *Client) { /* Set supplied client password */ if (password) free(password); - password = strdup(Client_Password(Client)); - conv.appdata_ptr = Client_Password(Client); + password = strdup(Conn_Password(Client_Conn(Client))); + conv.appdata_ptr = Conn_Password(Client_Conn(Client)); /* Initialize PAM */ retval = pam_start("ngircd", Client_OrigUser(Client), &conv, &pam);

1 0

Alexander Barton : Enhance "ServiceMask" to handle a list of masks
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 360a254be0e55e975998d0f3a5ff301ac3346f72 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=360a254b… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 13:24:54 2012 +0200 Enhance "ServiceMask" to handle a list of masks The "ServiceMask" variable in "Server" blocks now can handle more than one mask using the new MatchCaseInsensitiveList() function. This makes marking "service clients" much more specific, which is a good thing per se, but which is the prerequisite for reasonably blocking these nick names, too (see commit a6dd2e3 for details). --- doc/sample-ngircd.conf.tmpl | 9 +++++---- man/ngircd.conf.5.tmpl | 10 ++++++---- src/ngircd/conf.c | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 6d9d770..57e6589 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -297,15 +297,16 @@ # Connect to the remote server using TLS/SSL (Default: false) ;SSLConnect = yes - # Define a (case insensitive) mask matching nick names that should be - # treated as IRC services when introduced via this remote server. + # Define a (case insensitive) list of masks matching nick names 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). # When you are connecting IRC services which mask as a IRC server # and which use "virtual users" to communicate with, for example # "NickServ" and "ChanServ", you should set this parameter to - # something like "*Serv". - ;ServiceMask = *Serv + # something like "*Serv" or "NickServ,ChanServ,XyzServ". + ;ServiceMask = *Serv,Global [Server] # More [Server] sections, if you like ... diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 71f0007..aff11a6 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -422,14 +422,16 @@ You can use the IRC Operator command CONNECT later on to create the link. Connect to the remote server using TLS/SSL. Default: false. .TP \fBServiceMask\fR (string) -Define a (case insensitive) mask matching nick names that should be treated as -IRC services when introduced via this remote server. REGULAR SERVERS DON'T NEED -this parameter, so leave it empty (which is the default). +Define a (case insensitive) list of masks matching nick names 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). .PP .RS When you are connecting IRC services which mask as a IRC server and which use "virtual users" to communicate with, for example "NickServ" and "ChanServ", -you should set this parameter to something like "*Serv". +you should set this parameter to something like "*Serv", "*Serv,OtherNick", +or "NickServ,ChanServ,XyzServ". .SH [CHANNEL] Pre-defined channels can be configured in .I [Channel] diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 41b5469..3966dc9 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -648,7 +648,8 @@ Conf_NickIsService(int ConfServer, const char *Nick) assert (ConfServer >= 0); assert (ConfServer < MAX_SERVERS); - return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick); + return MatchCaseInsensitiveList(Conf_Server[ConfServer].svs_mask, + Nick, ","); } /**

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates August 2012