X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1814e48902db3be0c80811f586800c111d48419f..f8a44ea2a6a15c52a590b62f70734b73b5be5572:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 2531a06..2d189ce 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -39,7 +39,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "scache.h"
@@ -94,7 +94,7 @@ int user_modes[256] = {
 	0,			/* W */
 	0,			/* X */
 	0,			/* Y */
-	0,			/* Z */
+	UMODE_SSLCLIENT,	/* Z */
 	/* 0x5B */ 0, 0, 0, 0, 0, 0, /* 0x60 */
 	UMODE_ADMIN,		/* a */
 	0,			/* b */
@@ -522,6 +522,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		add_to_id_hash(source_p->id, source_p);
 	}
 
+	if (IsSSL(source_p))
+		source_p->umodes |= UMODE_SSLCLIENT;
+
 	if (source_p->umodes & UMODE_INVISIBLE)
 		Count.invisi++;
 
@@ -812,16 +815,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 	if(IsConfExemptKline(aconf))
 	{
 		SetExemptKline(source_p);
-		sendto_one_notice(source_p, ":*** You are exempt from K/G/X lines. congrats.");
-	}
-
-	if(IsConfExemptGline(aconf))
-	{
-		SetExemptGline(source_p);
-
-		/* dont send both a kline and gline exempt notice */
-		if(!IsConfExemptKline(aconf))
-			sendto_one_notice(source_p, ":*** You are exempt from G lines.");
+		sendto_one_notice(source_p, ":*** You are exempt from K/X lines. congrats.");
 	}
 
 	if(IsConfExemptDNSBL(aconf))
@@ -1007,6 +1001,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
 		/* can only be set on burst */
 		case 'S':
+		case 'Z':
 		case ' ':
 		case '\n':
 		case '\r':
@@ -1369,7 +1364,7 @@ construct_umodebuf(void)
 
 void
 change_nick_user_host(struct Client *target_p,	const char *nick, const char *user,
-		      const char *host, int newts, char *format, ...)
+		      const char *host, int newts, const char *format, ...)
 {
 	rb_dlink_node *ptr;
 	struct Channel *chptr;