X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/2c489d8e659ad5c219bb770cc37b4d00bc5d93d0..c3a0fde28f4866bc6df368456de0bb86c663229e:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 3086828..441012c 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -711,7 +711,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 
 		if(aconf->autojoin != NULL)
 		{
-			user_join(client_p, source_p, aconf->autojoin, NULL, 0);
+			user_join(client_p, source_p, aconf->autojoin, NULL);
 		}
 	}
 
@@ -1364,7 +1364,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 		 * Plus this is post-umode being set so you'll pass +I $o or +O.
 		 * Hence why we're making this a normal clean join. --jdhore
 		 */
-		user_join(&me, source_p, aconf->autojoin_opers, NULL, 0);
+		user_join(&me, source_p, aconf->autojoin_opers, NULL);
 	}
 
 	return (1);
@@ -1435,7 +1435,7 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 	struct membership *mscptr;
 	int changed = irccmp(target_p->name, nick);
 	int changed_case = strcmp(target_p->name, nick);
-	int do_qjm = irccmp(target_p->username, user) || irccmp(target_p->host, host);
+	int do_qjm = irccmp(target_p->username, user) || (irccmp(target_p->host, host) && ConfigChannel.cycle_host_change);
 	char mode[10], modeval[NICKLEN * 2 + 2], reason[256], *mptr;
 	va_list ap;