projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keep in sync with OGN upstream (SVN-318)
[ircu2.10.12-pk.git]
/
ircd
/
m_relay.c
diff --git
a/ircd/m_relay.c
b/ircd/m_relay.c
index 209d65a95cbab8141b3eb832861c287ffbcd8725..9996719bc6fd97b7c5ff66db764870928bfbdc09 100644
(file)
--- a/
ircd/m_relay.c
+++ b/
ircd/m_relay.c
@@
-90,6
+90,8
@@
static void mode_a_check_altchan(struct Client* sptr, char *channel) {
joinbuf_flush(&create);
}
} else {
joinbuf_flush(&create);
}
} else {
+ if(find_member_link(chptrb, sptr))
+ return; //we have already joined this channel
//first of all check if we may even join this channel
int err2 = 0;
int flags = 0;
//first of all check if we may even join this channel
int err2 = 0;
int flags = 0;
@@
-105,6
+107,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;
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!
else if (find_ban(sptr, chptrb->banlist))
err2 = ERR_BANNEDFROMCHAN;
else if (*chptrb->mode.key) //Fix this!
@@
-235,7
+239,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);
}
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)
);
}
}
}
}