X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=blobdiff_plain;f=ircd%2Fm_relay.c;h=9996719bc6fd97b7c5ff66db764870928bfbdc09;hp=fc8e1cd4ce4bb356eefa65d36b1a4e2c91563c28;hb=e165cdc86c551c019589ac68e875aba23e729d21;hpb=2cbdbba56fb98277d92acc7fe2364dd69a2296a4

diff --git a/ircd/m_relay.c b/ircd/m_relay.c
index fc8e1cd..9996719 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 && parv[1] != "0")
+	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)
@@ -90,6 +90,8 @@ static void mode_a_check_altchan(struct Client* sptr, char *channel) {
 		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;
@@ -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;
+      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!
@@ -230,11 +234,12 @@ signed int ms_relay(struct Client* cptr, struct Client* sptr, signed int parc, c
 	 struct Client *acptr;
 	 struct Channel *chptr;
 	 if(acptr = findNUser(parv[1])) {
-	  if(chptr = FindChannel(parv[3]) && chptr->mode.altchan && 
+	  if(IsChannelName(parv[3]) && strIsIrcCh(parv[3]) && 
+         (chptr = FindChannel(parv[3])) && 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));
 	 }
 	}