X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=blobdiff_plain;f=ircd%2Fm_relay.c;h=2bfb142da4b69c3c3180c94b75f57c3e5b51d98b;hp=8aa687e0b6b6ebff06e7dc53c482e403eba78a7b;hb=bb5d6a24f02155e2252474809cd5e7161fa29b93;hpb=b5b5189a02dd7ff20e7bf7eed952a014a2a10edd diff --git a/ircd/m_relay.c b/ircd/m_relay.c index 8aa687e..2bfb142 100644 --- a/ircd/m_relay.c +++ b/ircd/m_relay.c @@ -39,9 +39,9 @@ static void loc_handler_LR(const char *num, char *parv[], signed int parc) { static void loc_handler_LA(const char *num, char *parv[], signed int parc) { if(num[0] != '!' || parc < 1) return; char *fakehost = NULL; - if (parc > 1 && !strcmp(parv[1], "0")) // 0 = no fakehost + if (parc > 1 && strcmp(parv[1], "0") != 0) // 0 = no fakehost fakehost=parv[1]; - + if(parc > 2) auth_loc_reply(&num[3], parv[0], fakehost, &parv[2] , parc - 2); else if(parc > 1) @@ -105,6 +105,8 @@ static void mode_a_check_altchan(struct Client* sptr, char *channel) { err2 = ERR_CHANNELISFULL; else if ((chptrb->mode.mode & MODE_REGONLY) && !IsAccount(sptr)) err2 = ERR_NEEDREGGEDNICK; + else if ((chptrb->mode.mode & MODE_SSLCHAN) && !IsSSL(sptr)) + err2 = ERR_SSLCHANNEL; else if (find_ban(sptr, chptrb->banlist)) err2 = ERR_BANNEDFROMCHAN; else if (*chptrb->mode.key) //Fix this! @@ -235,7 +237,7 @@ signed int ms_relay(struct Client* cptr, struct Client* sptr, signed int parc, c IsChannelName(chptr->mode.altchan) && strIsIrcCh(chptr->mode.altchan)) { mode_a_check_altchan(acptr,chptr->mode.altchan); } - send_reply(acptr, ERR_JOINACCESS, parv[3]); + send_reply(acptr, ERR_JOINACCESS, parv[3], feature_str(FEAT_ERR_JOINACCESS)); } }